Manual merge with Premake-dev; trying to stop the rebasing madness
Manual merge with Premake-dev; trying to stop the rebasing madness

Amorph/premake-stable,Amorph/premake-stable,Amorph/premake-stable,Amorph/premake-dev,Amorph/premake-dev,Amorph/premake-dev