Sync'd branch integration/fx-team with upstream @ Wed Oct 22 15:28:59 PDT 2014