CRAFTERCMS-97: Managing release version ticket.
CRAFTERCMS-133: Managing this issue for next week release. We still have to think in a better fix.
Merge remote-tracking branch 'alvaro/master'