Merged https://github.com/forkcms/forkcms/pull/372