Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 09:01:34 PDT 2014