Merge sfu-develop

For some reason github won't let me push. Trying it this way.