Update functional from master

This commit is contained in:
Automated Commit 2018-04-15 21:45:08 +00:00
parent 9d9abcd451
commit 5a05c4e3cd

@ -1 +1 @@
Subproject commit ce40e739b6b9d951d0668186f711f84872293e65
Subproject commit 7516442815900430cc9c4a6190354e11bcbe72dd