Imported Upstream version 2.1.5
Merge tag 'upstream/2.1.5'

Upstream version 2.1.5
ruby2.1 (2.1.5-1bbox1~trusty1)