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