Sync'd branch integration/fx-team with upstream @ Wed Sep 17 07:20:39 PDT 2014