Merge pull request #802 from superdesk/devel

Devel