Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 29 07:17:54 PDT 2014