Sync'd branch integration/fx-team with upstream @ Wed Sep 17 15:56:21 PDT 2014