Re Fixes #217
Merge branch '1.1' of github.com:pagelines/framework into 1.1