Commit d7c81945b0619ac707ebd0fb007bf63c3bef3037

Edward Thomson 2015-03-09T10:18:39

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