Merge branch 'stable-2.13' * stable-2.13: Fix yet another null pointer exception Change-Id: Id2b163aee90705c9359e6e5e5d2469e9224f9989