Merge from master: https://github.com/forkcms/forkcms/pull/564/files
Comment added