Sync'd branch integration/fx-team with upstream @ Tue Sep 23 23:18:39 PDT 2014