Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 17 07:23:49 PDT 2014