Sync'd branch integration/fx-team with upstream @ Wed Sep 24 13:55:43 PDT 2014