Commit c148533024319689fca016f7c452d556265bb13f

Edward Thomson 2016-05-09T08:58:44

Merge pull request #3767 from pks-t/pks/misc-fixes Misc fixes