[Insight-developers] merges into release branch

[Matt McCormick]

Hi Brad K,

Could you please merge the following to patch sets into the release branch:

  http://review.source.kitware.com/#change,2357

  http://review.source.kitware.com/#change,2142

Thanks,
Matt