Merge commit 'c6eb5ac988518f41938c4f021003d6c202d84819' * commit 'c6eb5ac988518f41938c4f021003d6c202d84819': Fix issue #2018454: NullPointerException in ImageSpan constructor
Merge commit 'c6eb5ac988518f41938c4f021003d6c202d84819' * commit 'c6eb5ac988518f41938c4f021003d6c202d84819': Fix issue #2018454: NullPointerException in ImageSpan constructor