Fixes.
Merge commit '90c7cffd8bd808f88070a823f6ef1741a67143a1'

Conflicts:
	Gemfile
	Gemfile.lock