Merge commit 'b4d20b7c'

Conflicts:
	moose-core/CMakeLists.txt

moose-core/Makefile

@@ -273,12 +273,12 @@ endif
 
 # Here we automagically change compilers to deal with MPI.
 ifdef USE_MPI
-	CXX = mpicxx
+	CXX = mpicxx --std=c++11
 #	CXX = /usr/local/mvapich2/bin/mpicxx
 #	PARALLEL_DIR = parallel
 #	PARALLEL_LIB = parallel/parallel.o
 else
-	CXX = g++
+	CXX = g++  --std=c++11
 #	CXX = CC	# Choose between Solaris CC and g++ on a Solaris machine
 endif