Sync'd branch integration/fx-team with upstream @ Wed Sep 17 09:23:37 PDT 2014