Version 1.1.6
Merge tag '1.1.6'

Version 1.1.6 upstream