Sync'd branch integration/fx-team with upstream @ Tue Sep 16 13:57:39 PDT 2014