Preparing for Live view-> need a stream to attach to.
Merge remote-tracking branch 'origin/master'