Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 10 08:03:38 PDT 2014