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