Sync'd branch integration/fx-team with upstream @ Wed Oct 22 22:21:44 PDT 2014