James McCoy - 2011-11-13

Fixed in maint/0.83.4 and merged to master.