Commit a3f693e9a1d2dae093c08f54103e336e52ab7eba

Edward Thomson 2015-03-20T16:57:32

Merge pull request #3003 from shawnl/master fix changelog