Merge branch 'master' into develop
Merge branch 'develop' of git://github.com/fsharp/FAKE into develop