Update with 20140806.3 from audreyt