6122
5045
5045
Mantis ticket 6010

committed and pushed changes done in mustache file.
Merge remote-tracking branch 'remotes/origin/2014.07.29'