Sync'd branch integration/fx-team with upstream @ Thu Oct  2 01:27:41 PDT 2014