Merge remote-tracking branch 'upstream/master' into devel
Merge remote-tracking branch 'upstream/devel' into devel
Merge remote-tracking branch 'upstream/devel' into devel
Merge remote-tracking branch 'upstream/devel' into devel
Merge branch 'devel' of https://github.com/marwoodandrew/superdesk-client into devel