Merge master

Merged ```master``` into ```taglib2```.
I have done this because the pull request #265 is a little complicated to merge.