am a18eec54: Merge "Fix regression in LEAP"

# By Jouni Malinen
# Via Gerrit Code Review (1) and Jean-Baptiste Queru (1)
* commit 'a18eec546fdd7b48cee7a4fce5ba0f2ca6ad7889':
  Fix regression in LEAP