Update functional from master.

This commit is contained in:
Automated Commit 2015-01-24 10:00:11 -05:00
parent a5d0d68d2c
commit 58c577709b

@ -1 +1 @@
Subproject commit 8bbbb7a71cd821480fc3adc069f733d60a947a85
Subproject commit 1bf379ab601eb52c97908cc2cc141fd6026bd708