Merge pull request #765 from khawkins/master

Latest shared