ticket:309 grunt update
Merge branch 't309_grunt_up_to_04'