Update on Tue Feb 18 21:48:12 EST 2014.
Merge on Tue Feb 18 21:52:57 EST 2014.