"HEAD"=>{branch, master} and official pmod_transform
Merge branch 'master' into ws

Conflicts:
	rebar.config