June 2013 release

Opening a pull request from `develop` to prepare for a June 2013 release. This pull request should only be merged once the commits in `develop` are deemed stable and ready to be blessed.