Merge develop into master (7.0.0, 7.1.0)#118

bartes wants to merge 3 commits into

mastercastle/castle-python:masterfrom

developcastle/castle-python:developCopy head branch name to clipboard