Sync'd branch integration/fx-team with upstream @ Fri Oct 10 12:20:42 PDT 2014