Some more master work
Some more master work
Some more master work
Some more master work
Some more master work
A hotfix.
Merge commit 'c7deef3'

Conflicts:
	Gemfile