Update functional from master.

This commit is contained in:
Automated Commit 2016-06-26 15:45:09 -04:00
parent 2ac05443cf
commit b5b87c0c30

@ -1 +1 @@
Subproject commit df98d4fd1ca9d8842da2653fb235ee3dcb2d5e73
Subproject commit 2ee1e5c25a2510a90fd2d97626216fc8d319739c