Pulling these into the base of 2.4

Signed-off-by: Mike Rylander <mrylander@gmail.com>