Merge pull request #802 from superdesk/devel

Devel
Merge pull request #803 from superdesk/master

Merge pull request #802 from superdesk/devel