Fixes #1
Merge branch 'dev' into 7.x-1.x