Shit hits the fan!
BO-666
Merge remote-tracking branch 'origin/master'

Conflicts:
	ololo/blahblah.txt
Something useful
BO-98542