Fixed typo in salt.master state.
Merge branch 'development' into production