Fix nil sum
Merge branch 'pjax' into cirandas