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