Merge branch 'master' into lammps-icms

# Resolved Conflicts:
#	doc/Manual.html
#	doc/Manual.txt
#	doc/pair_hybrid.txt
#	doc/pair_reax.html
#	doc/pair_reax.txt
#	doc/pair_reax_c.txt
#	src/MANYBODY/pair_polymorphic.cpp

src/domain.cpp

@@ -1502,8 +1502,6 @@ void Domain::add_region(int narg, char **arg)
 
   // create the Region
 
-  if (strcmp(arg[1],"none") == 0) error->all(FLERR,"Unknown region style");
-
   if (lmp->suffix_enable) {
     if (lmp->suffix) {
       char estyle[256];
@@ -1544,6 +1542,8 @@ void Domain::add_region(int narg, char **arg)
     }
   }
 
+  if (strcmp(arg[1],"none") == 0) error->all(FLERR,"Unknown region style");
+
 #define REGION_CLASS
 #define RegionStyle(key,Class) \
   else if (strcmp(arg[1],#key) == 0) \