Update fusion from develop

This commit is contained in:
Automated Commit 2017-10-30 05:45:04 +00:00
parent 4685527327
commit 55825cdf0d

@ -1 +1 @@
Subproject commit 3cd289836dc02d77379aa5b31eaa4d2fc128e526
Subproject commit 33ce5701aeeee6a6a14a82b1603e6ce406c92e7e