Solves CRAFTERCMS-477
Solves CRAFTERCMS-477
Merge remote-tracking branch 'cortiz/master'