Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 12:13:46 PDT 2014