Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 07:48:42 PDT 2014