fangeugene Support two champs in 2017. Fixes #1670 (#1673)

Users who have contributed to this file

• fangeugene
• phil-lopreiato
• gregmarra