Sync'd branch integration/fx-team with upstream @ Fri Oct 17 01:04:44 PDT 2014