Ref #855
Merge pull request #857 from keent/master

Ref #855