Update functional from develop

This commit is contained in:
Automated Commit 2017-10-02 12:45:04 +00:00
parent 0a9af2d268
commit 9e9cb70e58

@ -1 +1 @@
Subproject commit 995370c90409a6aa860054beca5c404970058b8a
Subproject commit ca954fb7c94f25ad73482c7125630684e3373364