- Added ==STARTUP== and ==SHUTDOWN== sections
Merge remote-tracking branch 'upstream/master'