Merge
Merge branch 'master' of https://github.com/marwoodandrew/superdesk-server
Merge remote-tracking branch 'remotes/upstream/master'
Merge remote-tracking branch 'andrew/master'