Merge branch 'get-info'

Conflicts:
	CHANGELOG.markdown