1011053 - Add a from_dict() method to the Criteria model.
Merge branch 'rbarlow-1011053'