http://i.qkme.me/3u8beg.jpg
Merge branch 'master' into aperture-science

Conflicts:
	core.wsdl