.
Merge branch 'hotfix/rotator_changes!!'
Merge branch 'master' of github.com:JBSN/GITFLOW into production

* 'master' of github.com:JBSN/GITFLOW:
  hotfix
restore functions
Merge branch 'hotfix/restore_functions' into staging