Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 24 20:33:40 PDT 2014