Manually merge in changes from S5 1.1

http://meyerweb.com/eric/tools/s5/