wip-1.0-132 #133

Closed
ctactic wants to merge 8 commits from wip-1.0-132 into develop-1.0
No description provided.