Applied all changes from master to this build made on 7/15/2013.
Versioning