Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 04:25:17 PDT 2014