diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58412dee9..8dde8e23f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,17 @@ Features in Experimental are subject to change and removal without being conside
This document is formatted according to the principles of [Keep A CHANGELOG](http://keepachangelog.com).
+## [2.15.0] - 2017-03-09
+
+## Added
+
+- Continue loading feature files after parsing errors ([445](https://github.com/picklesdoc/pickles/pull/445)) (by [@dirkrombauts](https://github.com/dirkrombauts), based on an idea by [@pleveill](https://github.com/pleveill))
+
+### Fixed
+
+- Fix localisation of "Examples" in Scenario Outlines ([440](https://github.com/picklesdoc/pickles/pull/440)) (by [@dirkrombauts](https://github.com/dirkrombauts))
+- Make ExcludeTags available to MSBuild ([444](https://github.com/picklesdoc/pickles/pull/444)) (by [@dirkrombauts](https://github.com/dirkrombauts), based on an idea by [@pleveill](https://github.com/pleveill))
+
## [2.14.0] - 2017-02-24
### Added
diff --git a/build.bat b/build.bat
index 3db14c6bd..905f46acc 100644
--- a/build.bat
+++ b/build.bat
@@ -1,5 +1,5 @@
@echo off
-set "picklesVersion=2.14.0"
+set "picklesVersion=2.15.0"
cls
diff --git a/docs/Output/Dhtml/Index.html b/docs/Output/Dhtml/Index.html
index 7656126c1..be4fc7695 100644
--- a/docs/Output/Dhtml/Index.html
+++ b/docs/Output/Dhtml/Index.html
@@ -202,7 +202,7 @@
+ :
diff --git a/docs/Output/Dhtml/js/featuresModel.js b/docs/Output/Dhtml/js/featuresModel.js
index d80bf4800..f76ded584 100644
--- a/docs/Output/Dhtml/js/featuresModel.js
+++ b/docs/Output/Dhtml/js/featuresModel.js
@@ -48,6 +48,7 @@ function Examples(data) {
this.Description = data.Description || '';
this.TableArgument = data.TableArgument == null ? null : new TableArgument(data.TableArgument.HeaderRow, data.TableArgument.DataRows);
this.Tags = data.Tags || null;
+ this.NativeKeyword = data.NativeKeyword || "Examples";
}
function Background(data) {
diff --git a/docs/Output/Dhtml/pickledFeatures.js b/docs/Output/Dhtml/pickledFeatures.js
index d2dc22c60..6053dffc2 100644
--- a/docs/Output/Dhtml/pickledFeatures.js
+++ b/docs/Output/Dhtml/pickledFeatures.js
@@ -545,7 +545,8 @@ jsonPWrapper ({
"Tags": [
"@small",
"@short_test"
- ]
+ ],
+ "NativeKeyword": "Examples"
},
{
"Name": "more than 100",
@@ -570,7 +571,8 @@ jsonPWrapper ({
},
"Tags": [
"@big"
- ]
+ ],
+ "NativeKeyword": "Examples"
}
],
"Name": "Add two positive numbers with many examples",
@@ -644,7 +646,8 @@ jsonPWrapper ({
]
]
},
- "Tags": []
+ "Tags": [],
+ "NativeKeyword": "Examples"
},
{
"Name": "more than 100",
@@ -667,7 +670,8 @@ jsonPWrapper ({
]
]
},
- "Tags": []
+ "Tags": [],
+ "NativeKeyword": "Examples"
}
],
"Name": "Add two negative numbers with many examples",
@@ -2333,7 +2337,8 @@ jsonPWrapper ({
]
]
},
- "Tags": []
+ "Tags": [],
+ "NativeKeyword": "Examples"
}
],
"Name": "Sample Markdown Scenario Outline Example",
@@ -3084,7 +3089,7 @@ jsonPWrapper ({
},
"Configuration": {
"SutName": "Pickles",
- "SutVersion": "2.14.0",
- "GeneratedOn": "24 Februar 2017 18:09:34"
+ "SutVersion": "2.15.0",
+ "GeneratedOn": "9 März 2017 16:27:59"
}
});
\ No newline at end of file
diff --git a/docs/Output/Excel/features.xlsx b/docs/Output/Excel/features.xlsx
index 4c2bee85e..5ef1e3ccf 100644
Binary files a/docs/Output/Excel/features.xlsx and b/docs/Output/Excel/features.xlsx differ
diff --git a/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html b/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
index 8a7c0974d..4a4c7ce59 100644
--- a/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
+++ b/docs/Output/Html/Features/00BasicGherkin/BasicGherkin.html
@@ -305,9 +305,9 @@ Using And and But