Update functional from develop

This commit is contained in:
Automated Commit 2018-01-06 14:15:04 +00:00
parent 0845dc1775
commit 99dc8fb50d

@ -1 +1 @@
Subproject commit 16a4ab6de637ba4bd6b8a592a5d13623341d015c
Subproject commit 4ef2b1ebeb13dd6d6c7d687b76cdf6e52dc2db45