diff --git a/.travis.yml b/.travis.yml
index 5c38a56f108..04494e88346 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,4 +21,4 @@ before_script:
 script:
 #  - mvn -e -B clean install && cd hapi-fhir-ra && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID clean test jacoco:report coveralls:report
 #  - mvn -Dci=true -e -B -P ALLMODULES,NOPARALLEL,ERRORPRONE clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report 
-  - mvn -Dci=true -e -B -P ALLMODULES,NOPARALLEL clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report 
+  - mvn -Dci=true -e -B -P ALLMODULES,MINPARALLEL clean install && cd hapi-fhir-jacoco && mvn -e -B -DTRAVIS_JOB_ID=$TRAVIS_JOB_ID jacoco:report coveralls:report 
diff --git a/pom.xml b/pom.xml
index 9d8cb8cd28d..084e85d2858 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1774,6 +1774,20 @@
 				</plugins>
 			</build>
 		</profile>
+		<profile>
+			<id>MINPARALLEL</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<configuration>
+							<forkCount>2</forkCount>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 		<profile>
 			<id>ERRORPRONE</id>
 			<build>
diff --git a/src/site/fml/hapi-fhir-faq.fml b/src/site/fml/hapi-fhir-faq.fml
index 87d90f4013e..4a9303b9623 100644
--- a/src/site/fml/hapi-fhir-faq.fml
+++ b/src/site/fml/hapi-fhir-faq.fml
@@ -145,4 +145,26 @@
 			</answer>
 		</faq>
 	</part>
+	<part id="Contributing">
+		<title>Contributing</title>
+		<faq id="vm_quit_during_build">
+			<question>
+				My build is failing with the following error:
+				<code>[ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test (default-test) on project hapi-fhir-jpaserver-base: Execution default-test of goal org.apache.maven.plugins:maven-surefire-plugin:2.19.1:test failed: The forked VM terminated without properly saying goodbye. VM crash or System.exit called?</code>
+			</question>
+			<answer>
+				<p>
+					This typically means that your build is running out of memory. HAPI's unit tests execute by 
+					default in multiple threads (the thread count is determined by the number of CPU cores available)
+					so in an environment with lots of cores but not enough RAM, you may run out. If you are getting
+					this error, try executing the build with the following arguments:
+				</p>
+				<pre>mvn -P ALLMODULES,NOPARALLEL install</pre>
+				<p>
+					See <a href="/hacking_hapi_fhir.html">Hacking HAPI FHIR</a> for more information on 
+					the build process.
+				</p>
+			</answer>
+		</faq>
+	</part>
 </faqs>