Ready for R17

Just in case you want that, too :)