Update functional from master

This commit is contained in:
Automated Commit 2018-01-14 16:15:11 +00:00
parent 99e62b1d73
commit cf48011672

@ -1 +1 @@
Subproject commit 3f2ef9b7263978995d799b1dfb20309fe5c9d90f
Subproject commit 96fbb48b421505ede6a6bddb1f7e688182cbc008