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