Merge branch 'master' into maint_modsync_384f4c1

Author: david22swan

.gitignore

@@ -1,4 +1,4 @@
-#This file is generated by ModuleSync, do not edit.Z
+# This file is generated by ModuleSync, do not edit.
 *.iml
 .*.sw[op]
 .DS_Store

.travis.yml

@@ -4,9 +4,6 @@ sudo: false
 language: ruby
 cache: bundler
 script: "bundle exec rake release_checks"
-#Inserting below due to the following issue: https://github.com/travis-ci/travis-ci/issues/3531#issuecomment-88311203
-before_install:
-  - gem update bundler
 matrix:
   fast_finish: true
   include:

manifests/params.pp

@@ -205,7 +205,7 @@
 
     'FreeBSD': {
       case $version {
-        '96': {
+        '96', '10': {
           $user                 = pick($user, 'postgres')
           $group                = pick($group, 'postgres')
           $datadir              = pick($datadir, "/var/db/postgres/data${version}")