Merge pull request #863 from khawkins/master

Latest shared