Sync'd branch integration/fx-team with upstream @ Tue Sep 23 11:27:38 PDT 2014