Merge the latest changes from expertiza/expertiza

Technically, I rebased the rails4 branch onto your local branch so that the changes in the rails4 branch occur before your commits. If you merge this pull request, it will automatically update your pull request at expertiza/expertiza.