Sync'd branch integration/fx-team with upstream @ Fri Oct 10 06:05:49 PDT 2014