Merge upstream changes: ign jquery plugin, some improvements