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