Updated version.
Merge branch 'master' into fancybox