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