Transferred fixes/upgrades from test branch. Refer to 201402 branch for list of changes in this push.
Versioning