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