Merge branch 'master' into dev
* changed default value for maxBackupCount to 10
Merge branch 'dev'