Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 31 10:34:40 PDT 2014