manual merging of 53c5e64af0a272f39eb245d99f95672f40a964b6

related to "More jquery-ifying #57"