Merge branch 'master' into 'unpack'

Conflicts:
	.travis.yml