Update functional from master.

This commit is contained in:
Automated Commit 2014-01-23 22:06:18 +00:00
parent 01252394e0
commit f612fc8f72

@ -1 +1 @@
Subproject commit 4502d6e66afcd8ebccd79292428dcefbade02b1b
Subproject commit 66477fe07ac7c0c04d219286feaeaa269bd59c05