Merge branch 'master' into appframework-master

apps/files/l10n/el.php

apps/files/l10n/hu_HU.php

apps/files_encryption/lib/keymanager.php

apps/files_encryption/lib/proxy.php

apps/files_sharing/lib/cache.php

apps/files_trashbin/l10n/hu_HU.php

apps/user_ldap/l10n/hu_HU.php

autotest.sh

core/js/placeholder.js

core/js/share.js

core/l10n/cs_CZ.php

core/l10n/da.php

core/l10n/fr.php

l10n/cs_CZ/core.po

l10n/da/core.po

l10n/da/lib.po

l10n/da/settings.po

l10n/el/files.po

l10n/fr/core.po

l10n/fr/settings.po