diff --git a/.ci/travis-prepare.sh b/.ci/travis-prepare.sh
index fd8c6fb4b..3a0f3b753 100644
--- a/.ci/travis-prepare.sh
+++ b/.ci/travis-prepare.sh
@@ -38,3 +38,9 @@ then
 fi
 
 cd "$CURDIR"
+
+cat <<EOF >> epics-base/configure/CONFIG_SITE
+USR_CPPFLAGS += $USR_CPPFLAGS
+USR_CFLAGS += $USR_CFLAGS
+USR_CXXFLAGS += $USR_CXXFLAGS
+EOF
diff --git a/.gitmodules b/.gitmodules
index 1f5f23d11..6ee7d43d4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -30,3 +30,11 @@
     path = modules/pvDatabase
     url = https://github.com/epics-base/pvDatabaseCPP
     branch = master
+[submodule "modules/pva2pva"]
+    path = modules/pva2pva
+    url = https://github.com/epics-base/pva2pva
+    branch = master
+[submodule "modules/example"]
+    path = modules/example
+    url = https://github.com/epics-base/exampleCPP
+    branch = master
diff --git a/.travis.yml b/.travis.yml
index 78f21eedd..ba866bb9f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,16 +3,6 @@ dist: trusty
 language: c
 compiler:
   - gcc
-env:
-  - CMPLR=gcc
-  - CMPLR=gcc EXTRA=CMD_CXXFLAGS=-std=c++11
-  - CMPLR=gcc STATIC=YES
-  - CMPLR=clang
-  - CMPLR=clang STATIC=YES
-  - WINE=32 TEST=NO STATIC=YES
-  - WINE=32 TEST=NO STATIC=NO
-  - RTEMS=4.10 TEST=NO
-  - RTEMS=4.9 TEST=NO
 addons:
   apt:
     packages:
@@ -28,5 +18,16 @@ addons:
 cache:
   directories:
    - $HOME/.cache
-install: sh .ci/travis-prepare.sh </dev/null
-script: sh .ci/travis-build.sh </dev/null
+install:
+ - ./.ci/travis-prepare.sh
+script:
+ - ./.ci/travis-build.sh
+env:
+ - BRCORE=master BRLIBCOM=master BRCA=master
+ - CMPLR=clang
+ - USR_CXXFLAGS=-std=c++11
+ - CMPLR=clang USR_CXXFLAGS=-std=c++11
+ - WINE=32 TEST=NO STATIC=YES
+ - WINE=32 TEST=NO STATIC=NO
+ - RTEMS=4.10 TEST=NO
+ - RTEMS=4.9 TEST=NO
diff --git a/modules/Makefile b/modules/Makefile
index 12c45108b..c9fb19f67 100644
--- a/modules/Makefile
+++ b/modules/Makefile
@@ -36,6 +36,12 @@ pvaClient_DEPEND_DIRS = pvAccess normativeTypes
 SUBMODULES += pvDatabase
 pvDatabase_DEPEND_DIRS = pvAccess
 
+SUBMODULES += pva2pva
+pva2pva_DEPEND_DIRS = pvAccess
+
+SUBMODULES += example
+example_DEPEND_DIRS = pva2pva pvaClient
+
 # Add any checked-out submodules to DIRS
 DIRS += $(subst /,,$(dir $(wildcard $(addsuffix /Makefile, $(SUBMODULES)))))
 
diff --git a/modules/example b/modules/example
new file mode 160000
index 000000000..66bf47924
--- /dev/null
+++ b/modules/example
@@ -0,0 +1 @@
+Subproject commit 66bf47924113ebc98065ee20100d8b3a58951e84
diff --git a/modules/normativeTypes b/modules/normativeTypes
index fc703958b..fc4b51cb4 160000
--- a/modules/normativeTypes
+++ b/modules/normativeTypes
@@ -1 +1 @@
-Subproject commit fc703958b325543bc6f7a5fd5f69966bb905d2ff
+Subproject commit fc4b51cb4922310e9bfa70603460a4113ed747fc
diff --git a/modules/pvData b/modules/pvData
index 2f6966505..f3e7f9bb8 160000
--- a/modules/pvData
+++ b/modules/pvData
@@ -1 +1 @@
-Subproject commit 2f69665056969d8d93c61fab836ccdf99611247d
+Subproject commit f3e7f9bb8f695b4509cefe4a5823e924f21af56c
diff --git a/modules/pvDatabase b/modules/pvDatabase
index f131f0631..1d5e9e7b2 160000
--- a/modules/pvDatabase
+++ b/modules/pvDatabase
@@ -1 +1 @@
-Subproject commit f131f0631c899195863e945d489be9cde944e6d5
+Subproject commit 1d5e9e7b251c73c533db068a663ecf68da4cd8dd
diff --git a/modules/pva2pva b/modules/pva2pva
new file mode 160000
index 000000000..3ed65813e
--- /dev/null
+++ b/modules/pva2pva
@@ -0,0 +1 @@
+Subproject commit 3ed65813e3952bfafd3907a00f2a0c307c7b6801
diff --git a/modules/pvaClient b/modules/pvaClient
index c9e7bc32b..64fc25c24 160000
--- a/modules/pvaClient
+++ b/modules/pvaClient
@@ -1 +1 @@
-Subproject commit c9e7bc32bd874e2f628ac3b5bd3171c762a2499d
+Subproject commit 64fc25c2403218d642388815b76160d7104f3d79