Merge pull request #1103 from jonathantneal/parallels-9

Parallels 9