Merge 0.8.1 into 0.9-work 

Testing pull request workflow for merging master forward into the 0.9-work branch.