Merge branch 'master' into develmasterrcz/master
commitf5fa5cdeab15cb38a4a51ce41d0f8f53166aa57e
authorJan Mandel <jan.mandel@gmail.com>
Sat, 8 Dec 2018 17:53:09 +0000 (8 10:53 -0700)
committerJan Mandel <jan.mandel@gmail.com>
Sat, 8 Dec 2018 17:53:09 +0000 (8 10:53 -0700)
tree1617f7a104c833adbe3d3de0d1ccafcece75cc84
parentf6563cca5f5a09e7dca6bb369544d041d3a2add7
parent15e8c2493b869c4dd449a614126095703c200c70
Merge branch 'master' into devel