release/21.1.6

Nicolas Berger

@nberger

ac1f82bb · Merge branch 'patch-2' into '21.1' · Jun 07, 2017

Tag release/21.1.6 from nightly/21.1/2017-06-07T2215 (second attempt)