Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  1 00:33:45 PDT 2014