Sync'd branch integration/b2g-inbound with upstream @ Wed Oct  8 04:08:42 PDT 2014