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