Merge branch 'master' into decompose_compass

Conflicts:
	cli/Gemfile