Sync'd branch integration/fx-team with upstream @ Tue Sep 23 16:52:40 PDT 2014