Update credits entry to include the username
Match coral reef water to surrounding water.
Merge branch 'master' of ssh://git.code.sf.net/p/wesnoth/code
Fix players changelog formatting
Disable difficulty option in Load Game when not applicable (patch #3834)

Fixes bug #20381. Patch by nurupo.
Reenabled the "Sample terrain under cursor" feature.
Optipng run

Overall statistics (only for files with a smaller recompressed size):
  Original size: 201 KiB on 46 files
 Optimized size: 80 KiB
   Total saving: 121 KiB = 60% decrease
Add C++11 override markers.

Adds the markers for gui2::twidget::has_widget.
Added a enabled/disabled states to the map_labels class.
Getter for the map labels.
Reenabled the commented out editor village action tool.
Reenabled the commented out editor unit action code.
Global getter for the current labels. Disable labels on context switch.

Needed for the label mouse action.
Reenabled the commented out mouse-action and action label code.
Enabled the editor label tool. Adjust the zoom level correspondingly.
Add C++11 override markers.

Adds the markers for gui2::twidget::layout_children.
Removed the "Feature not implemented yet." mark for the map label tool.
Add C++11 override markers.

Adds the markers for gui2::twidget::child_populate_dirty_list.
Fix spelling in comments.
Add C++11 override markers.

Adds the markers for gui2::tcontrol::set_members.