Update with 20140801.1 from audreyt