Merge topic 'fix-mpi-tag-ub'

f91b31b6 fix MPI tags where greater than MPI_TAG_UB
Merge topic 'python_api_cleanup'

5209bc13 Minor API consistency cleanups.
Merge topic 'python_syntax_highlighting_keep_scroll_position'

15015a05 Keep scroll position when syntax highlighting python
Merge topic 'xdisplay_test_workaround'

46c9a5b0 Fix incorrect 'if' in 2ea0acde.
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: I24cb6411093c2890c1bf12871e8c15eb5bd44500
Update version to 4.2.0.

Change-Id: I2d9a41e0ac5c614c5218afe8f6273b4966095cc1
Merge topic 'update_versoin_4.2.0' into next

945dce7e Update version to 4.2.0.