Merge branch 'release/1.4.0-beta' into develop
Fix some paths, fix htaccess template and improve support for client-side placeholders
Merge branch 'release/1.4.0'