Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 17 16:33:41 PDT 2014