Squashed 'core/' changes from aec9d25..db0321d

db0321d No subdirectory in FTP upload
d0cf537 Merge branch 'develop' into feature/easyplugin
5840d42 Fix CLI Exception messages

git-subtree-dir: core
git-subtree-split: db0321d91f56a173fdb70b672d8ffbf01386699c
Merge commit '9c4d4e46b21cdce2ffb2533a8ce1fd3ee5a159db' into develop