Sync'd branch integration/fx-team with upstream @ Tue Sep  2 20:29:39 PDT 2014