Merge branch 'hotfix-3.2.1' into 'master'

Bumblebee 3.2.1

Closes GH-394, GH-400
Ignore error on X shutdown
Merge pull request #602 from Dalrik/exit-error

Ignore "Server terminated successfully" message.