going to package supervisord
Merge remote-tracking branch 'origin/master'
staging back to master