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