4/4/13 - 6/11/13 malsup commits.

Commits from malsup from 4/4/13-6/11/13.