Ahmil's changes to release
Merge branch 'release' of https://github.com/ajilani/safety into release

Conflicts:
	sometext.txt