Commit aacfd03dba68333da726bb63e2594f3ed4a16422

Edward Thomson 2015-06-24T00:30:19

Merge pull request #3251 from git-up/fixes Fixes