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