CRAFTERCMS-97 and CRAFTERCMS-93: Managing those issues.
Merge remote-tracking branch 'alvaro/master'