Sync'd branch integration/fx-team with upstream @ Tue Sep  2 02:50:35 PDT 2014