Merge remote-tracking branch 'origin/master' into SIT-838_b

Conflicts:
	Gemfile.lock
	lib/bureaucrat/utils.rb
SIT-838 bump version to 0.12.4