Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 18:37:50 PDT 2014