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