Update functional from develop

This commit is contained in:
Automated Commit 2017-05-31 21:45:04 +00:00
parent 95bacc48a6
commit f600302de3

@ -1 +1 @@
Subproject commit 1706cb5937137ac0c63bfb4f6cad6bf206e38e70
Subproject commit 767673645e14aac6020ad45cc88cc4716c242851