Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 24 03:24:51 PDT 2014