grunt Lato changes
Merge branch 'grunt'