Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 10:58:44 PDT 2014