Sync'd branch integration/fx-team with upstream @ Tue Oct 28 11:46:42 PDT 2014