Update functional from develop

This commit is contained in:
Automated Commit 2017-08-24 21:15:04 +00:00
parent 261e5bef60
commit 28f9c36d74

@ -1 +1 @@
Subproject commit 7eccdaa78d15e63f20fc3cb3ad7977852bf0ef26
Subproject commit 1360fbe99ad1205e4e675f3a80c83cd910f5122f