spring/spring — pull request #85 by abma (2013-11-18 00:29:17+00:00)
Title: hopefully fix merge mess

git diff looks correct, so should be fine... sorry!