Merge branch 'master' into 1.0

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.35'
+version = '1.0.36.dev0'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read() + "\n" + \
     open("CHANGES.rst").read() + "\n"

stack/slapos.cfg

@@ -133,7 +133,7 @@ pytz = 2016.6.1
 requests = 2.11.1
 setuptools = 19.6.2
 six = 1.10.0
-slapos.cookbook = 1.0.31
+slapos.cookbook = 1.0.35
 slapos.core = 1.3.15
 slapos.extension.strip = 0.1
 slapos.libnetworkcache = 0.14.5
@@ -164,11 +164,11 @@ functools32 = 3.2.3.post2
 ipaddress = 1.0.17
 
 # Required by:
-# slapos.cookbook==1.0.31
+# slapos.cookbook==1.0.35
 jsonschema = 2.5.1
 
 # Required by:
-# slapos.cookbook==1.0.31
+# slapos.cookbook==1.0.35
 lock-file = 2.0
 
 # Required by: