Sync'd branch integration/fx-team with upstream @ Tue Sep 16 09:27:38 PDT 2014