Merge change 2260

* changes:
  change 2115 wasn't merged properly into master. this fixes that.