Update thread from develop

This commit is contained in:
Automated Commit 2017-12-21 17:45:04 +00:00
parent 860febde6e
commit fe65bf1393

@ -1 +1 @@
Subproject commit 5141adee9624b9bad27a3fdeb3d430384fd8b3f1
Subproject commit a0c23a608a89e0b6e6a459829c02346dcdc78553