Merge remote-tracking branch 'origin/stable'

* origin/stable:
  (MODULES-3775) (msync 8d0455c) update travis/appveyer w/Ruby 2.3
  (maint) modulesync 70360747

Author: Iristyle

.travis.yml

@@ -12,6 +12,8 @@ matrix:
     env: PUPPET_GEM_VERSION="~> 3.0"
   - rvm: 2.1.5
     env: PUPPET_GEM_VERSION="~> 4.0"
+  - rvm: 2.3.1
+    env: PUPPET_GEM_VERSION="~> 4.0"
   - rvm: 2.0.0
     env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 1.9.3

Gemfile

@@ -103,14 +103,14 @@ if explicitly_require_windows_gems
     gem "win32-eventlog", "0.5.3","<= 0.6.5",    :require => false
     gem "win32-process", "0.6.5","<= 0.7.5",     :require => false
     gem "win32-security", "~> 0.1.2","<= 0.2.5", :require => false
-    gem "win32-service", "0.7.2","<= 0.8.7",     :require => false
+    gem "win32-service", "0.7.2","<= 0.8.8",     :require => false
     gem "minitar", "0.5.4",                      :require => false
   else
     gem "ffi", "~> 1.9.0",                       :require => false
     gem "win32-eventlog", "~> 0.5","<= 0.6.5",   :require => false
     gem "win32-process", "~> 0.6","<= 0.7.5",    :require => false
     gem "win32-security", "~> 0.1","<= 0.2.5",   :require => false
-    gem "win32-service", "~> 0.7","<= 0.8.7",    :require => false
+    gem "win32-service", "~> 0.7","<= 0.8.8",    :require => false
     gem "minitar", "~> 0.5.4",                   :require => false
   end
 
@@ -137,7 +137,7 @@ else
     gem "win32-eventlog", "<= 0.6.5",   :require => false
     gem "win32-process", "<= 0.7.5",    :require => false
     gem "win32-security", "<= 0.2.5",   :require => false
-    gem "win32-service", "<= 0.8.7",    :require => false
+    gem "win32-service", "<= 0.8.8",    :require => false
   end
 end
 

appveyor.yml

@@ -18,6 +18,10 @@ environment:
     RUBY_VER: 21
   - PUPPET_GEM_VERSION: ~> 4.0
     RUBY_VER: 21-x64
+  - PUPPET_GEM_VERSION: ~> 4.0
+    RUBY_VER: 23
+  - PUPPET_GEM_VERSION: ~> 4.0
+    RUBY_VER: 23-x64
   - PUPPET_GEM_VERSION: 3.7.0
     RUBY_VER: 193
   - PUPPET_GEM_VERSION: 3.7.0