Incremented version and build number
Merge commit 'e80efdc6f2351bee2c746f325f597dc01f54a30d'