Merge branch 'hotfix/0.2.11'
Try out new relic (missing lock file)
Merge branch 'hotfix/0.2.12' into dev