another try for stop recordings bug :-)
Merge remote-tracking branch 'origin/master' into andyblac