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