Sync'd branch integration/b2g-inbound with upstream @ Wed Aug 27 00:47:38 PDT 2014