Version 3.3.6 and 3.4

Getting ready in advance, as usual. As for 3.3.6, I had to release it
right after I released 3.3.5, because of an issue with WP's repository.
Merge pull request #111 from duechiacchiere/master

Version 3.3.6 and 3.4