Merge branch 'master' into iss30
Merge pull request #32 from InebriatedSquirrel/iss30

Iss30 merge to master
Upgrade to 4.2
Merge branch 'master' into iss67