Update function from master.

This commit is contained in:
Automated Commit 2015-01-18 13:00:17 -05:00
parent 5c5af6ab08
commit 6a5ae432d5

@ -1 +1 @@
Subproject commit 8f8cdae9881da1faf5d136169f5cd06977b879d2
Subproject commit 675d95536416779e1d0838963f55879069a28419