Correction of mistake that most likely creeped in due to incorrect git merging.
Merge branch 'master' into develop