Merge remote-tracking branch 'upstream/master' into bbb

Conflicts:
	elftools/elf/dynamic.py

Resolved by using upstream's verbatim copy because vapier's change is
now in upstream.

Change-Id: I6c597d4ef0a876d26736f96360cff95c072e8005