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