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