First Commit
Merge commit '579d4be86e801457643a3b82fd595452578d8f50' into 1.0