Finn Thain - 2013-10-30

Please test with latest code. If the bug is still present, please provide instructions for us to reproduce the bug.