RTD now kills the mirror app on startup
Merge remote-tracking branch 'origin/master'