Merge unstable back into master

Since the rtmp tests are passing now, I'm merging unstable into master