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