Merge branch 'dev' (0.3.3 features) into 'master'