Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 08:35:36 PDT 2014