Sync'd branch integration/b2g-inbound with upstream @ Wed Oct 29 12:41:38 PDT 2014