Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 17:04:37 PDT 2014