removed ignore-error parameter
Merge branch 'master' into develop