Update logic from master.

This commit is contained in:
Automated Commit 2014-05-16 11:00:07 -04:00
parent b9a229d48c
commit 081e1c847e

@ -1 +1 @@
Subproject commit 2afd1a9ec652b1d90f4551c6c47aa6d67b620e0c
Subproject commit 1dab9cd10a7838f3ea2f02284500e410204f550a