Advance to Khans of Tarkir release
Merge branch 'khans-of-tarkir'
Merge branch 'master' into gh-pages