Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  1 09:19:42 PDT 2014