Merge branch 'gh134-Rails4' into staging. Fixes #134