Merge with stable

diff --cc Src/Common/MDITabBar.cpp
Simple merge

diff --cc Src/Merge.cpp
Simple merge

diff --cc Src/Merge.h
Simple merge

diff --cc Translations/WinMerge/English.pot
index 502767d,ab13c28..992c72c
--- 1/Translations/WinMerge/English.pot
--- 2/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@@ -8,7 -8,7 +8,7 @@@ msgid "
  msgstr ""
  "Project-Id-Version: WinMerge\n"
  "Report-Msgid-Bugs-To: http://bugs.winmerge.org/\n"
- "POT-Creation-Date: 2015-03-21 17:16+0000\n"
 -"POT-Creation-Date: 2015-03-22 20:21+0000\n"
++"POT-Creation-Date: 2015-03-22 20:57+0000\n"
  "PO-Revision-Date: \n"
  "Last-Translator: \n"
  "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"