Fixed bug #2307
Merge pull request #2475 from chaseWillden/master

Fixed bug #2307