Merge remote-tracking branch 'github/pull/341'

diff --cc Gemfile.lock
index e6656041a50bda527b5cebc5329900d3bfae6506,1cf2685036e6c349dc7cafbd851480b417fb57e4..46d14142b03627e615bac798f0a70f8d9b4c67e7
--- 1/Gemfile.lock
--- 2/Gemfile.lock
+++ b/Gemfile.lock
@@@ -5,10 -5,10 +5,10 @@@ GE
      bcrypt_pbkdf (1.0.1)
      builder (3.2.4)
      chef-utils (16.4.41)
 -    cookstyle (6.17.5)
 +    cookstyle (6.17.7)
        rubocop (= 0.90.0)
      diff-lcs (1.4.4)
-     docker-api (1.34.2)
+     docker-api (2.0.0)
        excon (>= 0.47.0)
        multi_json
      ed25519 (1.2.4)