manual merging of 610562c

related to "More jquery-ifying #57" and #148