Sync'd branch integration/fx-team with upstream @ Wed Oct 22 08:11:48 PDT 2014