Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 17 15:44:36 PDT 2014