rails 3.2.12
Merge branch 'master' of github.com:espen/balder