Carl Love - 2013-12-18

I reviewed the patch, applied it and tested it. The patch fixed the issues. Looks good.