am deed673a: Merge "Use std::enable_if instead of a custom helper class."

* commit 'deed673a2f692bbd2edb3b5312c43990916c77f8':
  Use std::enable_if instead of a custom helper class.