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