diff --git a/.travis.yml b/.travis.yml
index c669f0b05..b443ae07a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -395,6 +395,11 @@ matrix:
env: SWIGLANG=mzscheme
sudo: required
dist: trusty
+ - compiler: gcc
+ os: linux
+ env: SWIGLANG=ocaml
+ sudo: required
+ dist: trusty
before_install:
- date -u
diff --git a/CHANGES.current b/CHANGES.current
index d25bd928c..50280fb91 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -7,6 +7,10 @@ the issue number to the end of the URL: https://github.com/swig/swig/issues/
Version 4.0.0 (in progress)
===========================
+2019-02-11: wsfulton
+ [OCaml] #1437 OCaml has been give the 'Experimental' language status. The examples work
+ and most of the test-suite is also working, so it is quite close to being a 'Supported' language.
+
2019-02-10: ZackerySpytz
#1450 Add support for C++11 UCS-2 and UCS-4 character literals. Also add support for
C++17 UTF8 character literals.
diff --git a/Doc/Manual/Ocaml.html b/Doc/Manual/Ocaml.html
index 9e0902bc8..11d21ce1b 100644
--- a/Doc/Manual/Ocaml.html
+++ b/Doc/Manual/Ocaml.html
@@ -7,7 +7,7 @@
-
+
diff --git a/Doc/Manual/Preprocessor.html b/Doc/Manual/Preprocessor.html
index 18629a4f3..10efe0c15 100644
--- a/Doc/Manual/Preprocessor.html
+++ b/Doc/Manual/Preprocessor.html
@@ -117,7 +117,7 @@ SWIG_JAVASCRIPT_JSC Defined when using Javascript for JavascriptCore
SWIG_JAVASCRIPT_V8 Defined when using Javascript for v8 or node.js
SWIGLUA Defined when using Lua
SWIGMZSCHEME Defined when using Mzscheme
-SWIGOCAML Defined when using Ocaml
+SWIGOCAML Defined when using OCaml
SWIGOCTAVE Defined when using Octave
SWIGPERL Defined when using Perl
SWIGPHP Defined when using PHP (any version)
diff --git a/Doc/Manual/SWIG.html b/Doc/Manual/SWIG.html
index be6eda739..79d52ef56 100644
--- a/Doc/Manual/SWIG.html
+++ b/Doc/Manual/SWIG.html
@@ -125,7 +125,6 @@ Supported Target Language Options
-java - Generate Java wrappers
-javascript - Generate Javascript wrappers
-lua - Generate Lua wrappers
- -ocaml - Generate Ocaml wrappers
-octave - Generate Octave wrappers
-perl5 - Generate Perl 5 wrappers
-php7 - Generate PHP 7 wrappers
@@ -138,6 +137,7 @@ Supported Target Language Options
Experimental Target Language Options
-mzscheme - Generate MzScheme/Racket wrappers
+ -ocaml - Generate OCaml wrappers
General Options
-addextern - Add extra extern declarations
diff --git a/Doc/Manual/Sections.html b/Doc/Manual/Sections.html
index 97338b0f4..1756e8b6a 100644
--- a/Doc/Manual/Sections.html
+++ b/Doc/Manual/Sections.html
@@ -47,7 +47,6 @@ Last update : SWIG-4.0.0 (in progress)
- Java support
- Javascript support
- Lua support
-- Ocaml support
- Octave support
- Perl5 support
- PHP support
@@ -62,6 +61,7 @@ Last update : SWIG-4.0.0 (in progress)
diff --git a/Doc/Manual/chapters b/Doc/Manual/chapters
index 1d3f96d87..4735341b6 100644
--- a/Doc/Manual/chapters
+++ b/Doc/Manual/chapters
@@ -25,7 +25,6 @@ Guile.html
Java.html
Javascript.html
Lua.html
-Ocaml.html
Octave.html
Perl5.html
Php.html
@@ -35,4 +34,5 @@ Ruby.html
Scilab.html
Tcl.html
Mzscheme.html
+Ocaml.html
Extending.html
diff --git a/Examples/test-suite/ocaml/Makefile.in b/Examples/test-suite/ocaml/Makefile.in
index f45f0859e..fd1daed15 100644
--- a/Examples/test-suite/ocaml/Makefile.in
+++ b/Examples/test-suite/ocaml/Makefile.in
@@ -52,7 +52,7 @@ run_testcase = \
include $(srcdir)/../common.mk
# Overridden variables here
-# none!
+SWIGOPT += -w524 # Suppress SWIGWARN_LANG_EXPERIMENTAL warning
# Custom tests - tests with additional commandline options
# none!
diff --git a/Source/Modules/swigmain.cxx b/Source/Modules/swigmain.cxx
index 0ff13a723..8d52af194 100644
--- a/Source/Modules/swigmain.cxx
+++ b/Source/Modules/swigmain.cxx
@@ -64,7 +64,7 @@ static TargetLanguageModule modules[] = {
{"-lua", swig_lua, "Lua", Supported},
{"-modula3", NULL, "Modula 3", Disabled},
{"-mzscheme", swig_mzscheme, "MzScheme/Racket", Experimental},
- {"-ocaml", swig_ocaml, "Ocaml", Supported},
+ {"-ocaml", swig_ocaml, "OCaml", Experimental},
{"-octave", swig_octave, "Octave", Supported},
{"-perl", swig_perl5, NULL, Supported},
{"-perl5", swig_perl5, "Perl 5", Supported},