Sync'd branch integration/fx-team with upstream @ Wed Sep 24 13:20:40 PDT 2014