Sync'd branch integration/fx-team with upstream @ Wed Sep 24 00:19:40 PDT 2014