CRAFTERCMS-140: Fixed this issue
Merge remote-tracking branch 'alvaro/master'