wip
Merge branch 'master' into devoncarew_polymer_investigation
polymer hacks
Merge pull request #1540 from devoncarew/devoncarew_polymer_investigation

Devoncarew polymer investigation