Merge branch 'release/2.0.3.1_experimental'

# Conflicts:
#	Duplicati/GUI/Duplicati.GUI.TrayIcon/Program.cs
#	Updates/build_version.txt
#	build-release.sh
#	changelog.txt

3 files changed, 17 insertions, 2 deletions

diff --git a/Updates/build_version.txt b/Updates/build_version.txt
index aabe6ec39..d00491fd7 100644
--- a/Updates/build_version.txt
+++ b/Updates/build_version.txt
@@ -1 +1 @@
-21
+1
diff --git a/build-release.sh b/build-release.sh
index 075f5e02d..c96ccd831 100644
--- a/build-release.sh
+++ b/build-release.sh
@@ -10,7 +10,7 @@ else
 	RELEASE_TYPE=$1
 fi
 
-RELEASE_VERSION="2.0.2.${RELEASE_INC_VERSION}"
+RELEASE_VERSION="2.0.3.${RELEASE_INC_VERSION}"
 RELEASE_NAME="${RELEASE_VERSION}_${RELEASE_TYPE}_${RELEASE_TIMESTAMP}"
 
 RELEASE_CHANGELOG_FILE="changelog.txt"
diff --git a/changelog.txt b/changelog.txt
index f906cce9d..c207fa794 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,18 @@
+2018-03-16 - 2.0.3.1_experimental_2018-03-16
+==========
+This experimental release is mostly the same as the canary build v2.0.2.20.
+Some of the major changes from the experimental build 2.0.2.15 are:
+
+* A new UI for setting the retention policy
+* Added an rclone backend
+* External links in the UI are now marked
+* Fixed a number of browser cache issues, which should fix the XSRF errors
+* Optional warnings when reaching the quota limit
+* Fixed not attempting to read non-symlink reparse points on Windows
+* Fixed a problem with the box.com backend
+* Fixed some crashes that were caused by the usage reporter filling up reports
+* Option to disable the file-size read-ahead scanner
+
 2018-03-06 - 2.0.2.21_canary_2018-03-06
 ==========
 * Rebuilt the style.css file