Merge branches with master

This commit is contained in:
Martin Stransky 2016-05-27 10:49:21 +02:00
parent 53a2567915
commit 87559ebbd7