Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 15 07:03:58 PDT 2014