Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 17 06:35:48 PDT 2014