Versión pro
Merge commit 'a0808a91d3907087e410e0b824fcba1313b0fb98'
Fix bug collapsin years (thanks carole)