Update with 20140804.1 from audreyt