Update with 20140902.0 from audreyt