Commit 93b4a50de1b124bf1808dbe55b9b5352274622e1

Edward Thomson 2015-01-20T16:19:55

Merge pull request #2704