Fixed
Merge that master

Conflicts:
	atom.xml