Revert "Merge branch 'refs/heads/master' into ajaxified"

This reverts commit 60cdbd6f4dda150c4ea5090bbebb8e1ae0f7a0bc, reversing
changes made to 80d23e8c68d57fa779cf59c608d7b5fc5b54da36.
Revert "Revert "Merge branch 'refs/heads/master' into ajaxified""

This reverts commit 8eb975a9c1625417099d6054a072a3ceb8bad659.