Sync'd branch integration/fx-team with upstream @ Wed Sep 17 19:41:50 PDT 2014