am c6de5c74: am 236ae4f2: Merge "Set alpha channel correctly when recomputing gradient" into klp-dev

* commit 'c6de5c74e1e5dd92c011a1f060e26e10b15ffb77':
  Set alpha channel correctly when recomputing gradient