manual merging of 610562c88226552920a8e9ae0fb59705abec73bb

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