Sync'd branch integration/fx-team with upstream @ Tue Sep 16 20:25:41 PDT 2014