Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 14:09:03 PDT 2014