Mark Miesfeld - 2011-06-06

Fix for 3308805