Sync'd branch integration/fx-team with upstream @ Tue Sep 23 10:32:42 PDT 2014