Merge branch 'master' into new-gui

Conflicts:
	Gemfile.lock