Sync'd branch integration/b2g-inbound with upstream @ Wed Sep 24 16:23:43 PDT 2014