Merge changes from master

Check for all changes: https://github.com/forkcms/forkcms/pull/443/files
Helper updated