Fixed bug regarding grain task not working for case when site located in root directory
Merge remote-tracking branch 'origin/master'