Release 6.1.5 code merged to master.

Implemented new stories for 6.1.5 patch release and updated the master branch.