am fc6ed159: Follow-up for 1.0.1j upgrade, part 2

* commit 'fc6ed1594aebe63aafa31af2bd01c41fab36d6cc':
  Follow-up for 1.0.1j upgrade, part 2