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