Update for default Composer settings, add some extra error messages.
Merge branch 'develop'.

Update for default Composer settings, add some extra error messages.