4.1 upgrades from 2013.07 branch
Merge pull request #10 from daniellemayne/develop

4.1 upgrades from 2013.07 branch