Fixed issue #526
Merge pull request #527 from FluffyJack/3-2-stable

Fixed issue #526