am 5856fd89: Merge "Fix recursive locking bug." into klp-dev

* commit '5856fd8935b8aa499930daed29105f6419a96a5e':
  Fix recursive locking bug.