tree e2887aced649eac06691b258152b7150c7a7c387
parent 5160fe6c8aac50d6c472c7a30dfdab4f11aca984
parent 8b2743e39a9faf695b329eba55d478128c8423b1
author David Ostrovsky <david@ostrovsky.org> 1574403742 -0800
committer David Ostrovsky <david@ostrovsky.org> 1574403747 -0800

Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Fix NullPointerException in init in batch mode

Change-Id: Ie6ba7d68fd69e55ed79a353e24ff0d4e15541ce6