Sync'd branch integration/fx-team with upstream @ Wed Sep 17 22:02:34 PDT 2014