added mlandauers patch
Merge branch 'master' into rails4