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