Merge branch 'bbidulock-master'
Fix for issue #131 (loss of focus after restoring windows).