Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 00:04:11 PDT 2014