27 June 2017 support

3b6188f