Merge pull request #798 from superdesk/master

Master update.
Merge pull request #801 from superdesk/master

Update from master.
Merge pull request #802 from superdesk/devel

Devel