Merge topic '0015060_fix_temporalshift_issue'

4a3f3687 BUG #15060. Fixed issue when using TemporalShiftScale.
Merge topic '15059_fix_time_comments'

dc7a344d BUG #15059: Bring back lost comments about ${TIME}.
Merge topic '15100_fix_color_map_editor_size'

68a6f38a Update test after widget size change.
c589883e BUG #15100: Increate ColorMapEditor dialog width.
Merge topic 'python_syntax_highlighting_bugs'

dc7f9b0b Add unicode character support in the syntax highlighter
14f64332 Python syntax highlighter ctor highlights text
Merge topic 'test_max'

96e4410d Add tests with NumPy only when NumPy is found.
519b6803 Added a test for BUG #15048.
Merge topic 'vtk_master_20141104'

b2b84c74 Update VTK
Merge master into next

* commit 'aa525d5d662ea6c7036e47a07e4c8a146a773e5f':

Change-Id: Ib43c0293fabe9f3cf0d6f0d7d5d3e3414aaeaa59