27 June 2017 support

39f26f6