Fixes #335
Merge branch 'Dev' of github.com:pagelines/framework into Dev