Merge master-1.1 into master ?

[dregad]

@cproensa I'm not sure what plans you have for this plugin, especially with regards to your work-in-progress next branch, but as I was merging a couple of pull requests this morning, I noticed that there were a few changes in 1.1. branch that were not in master, so there is a proposal to get them in.

Feel free to accept the PR or just close it if you think it's not useful / necessary. Note that I did not actually test the code after merging.