Update functional from develop.

This commit is contained in:
Automated Commit 2016-09-30 04:45:07 -04:00
parent 410417ba62
commit 12b0b4e7e8

@ -1 +1 @@
Subproject commit 86d7f6b568290170ae2a6d3e62ad1a7c766f635b
Subproject commit 58eb996d0f848215053ca6a6dc8169bb4be14873