Update functional from develop.

This commit is contained in:
Automated Commit 2015-01-05 15:00:08 -05:00
parent 47963a7f88
commit 17d7a51a05

@ -1 +1 @@
Subproject commit 770e4dea0803e3a97339d2e0a606da487dd9fc18
Subproject commit 97754f5bd842dcaaffa29382213a81b2b9c92e37