Sync'd branch integration/fx-team with upstream @ Tue Oct 14 21:34:49 PDT 2014