Add unpivot
Merge branch 'Rails4'