Sync'd branch integration/fx-team with upstream @ Tue Oct 14 17:52:42 PDT 2014