Bump version to v5.0.10 (#3604 )

Revert "Switch the PHP grammar to the upstream repo (#3575 )" (#3603 )
* Revert "Switch the PHP grammar to the upstream repo (#3575)" Manually reverting this as it breaks PHP syntax highlighting on github.com. * Update submodule ref
2025-10-29 17:50:22 +00:00 · 2017-05-05 18:49:35 +01:00 · 2017-05-05 17:11:29 +01:00 · 2017-05-03 14:49:26 +01:00 · 2017-04-29 11:15:39 +02:00 · 2017-04-28 16:20:22 -07:00
77 changed files with 3519 additions and 102 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -836,3 +836,6 @@
 [submodule "vendor/grammars/marko-tmbundle"]
 	path = vendor/grammars/marko-tmbundle
 	url = https://github.com/marko-js/marko-tmbundle
+[submodule "vendor/grammars/language-jolie"]
+	path = vendor/grammars/language-jolie
+	url = https://github.com/fmontesi/language-jolie
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -10,15 +10,15 @@ We try only to add new extensions once they have some usage on GitHub. In most c

 To add support for a new extension:

-0. Add your extension to the language entry in [`languages.yml`][languages], keeping the extensions in alphabetical order.
-0. Add at least one sample for your extension to the [samples directory][samples] in the correct subdirectory.
-0. Open a pull request, linking to a [GitHub search result](https://github.com/search?utf8=%E2%9C%93&q=extension%3Aboot+NOT+nothack&type=Code&ref=searchresults) showing in-the-wild usage.
+1. Add your extension to the language entry in [`languages.yml`][languages], keeping the extensions in alphabetical order.
+1. Add at least one sample for your extension to the [samples directory][samples] in the correct subdirectory.
+1. Open a pull request, linking to a [GitHub search result](https://github.com/search?utf8=%E2%9C%93&q=extension%3Aboot+NOT+nothack&type=Code&ref=searchresults) showing in-the-wild usage.

 In addition, if this extension is already listed in [`languages.yml`][languages] then sometimes a few more steps will need to be taken:

-0. Make sure that example `.yourextension` files are present in the [samples directory][samples] for each language that uses `.yourextension`.
-0. Test the performance of the Bayesian classifier with a relatively large number (1000s) of sample `.yourextension` files. (ping **@bkeepers** to help with this) to ensure we're not misclassifying files.
-0. If the Bayesian classifier does a bad job with the sample `.yourextension` files then a [heuristic](https://github.com/github/linguist/blob/master/lib/linguist/heuristics.rb) may need to be written to help.
+1. Make sure that example `.yourextension` files are present in the [samples directory][samples] for each language that uses `.yourextension`.
+1. Test the performance of the Bayesian classifier with a relatively large number (1000s) of sample `.yourextension` files. (ping **@bkeepers** to help with this) to ensure we're not misclassifying files.
+1. If the Bayesian classifier does a bad job with the sample `.yourextension` files then a [heuristic](https://github.com/github/linguist/blob/master/lib/linguist/heuristics.rb) may need to be written to help.


 ## Adding a language
@@ -27,17 +27,17 @@ We try only to add languages once they have some usage on GitHub. In most cases

 To add support for a new language:

-0. Add an entry for your language to [`languages.yml`][languages]. Omit the `language_id` field for now.
-0. Add a grammar for your language: `script/add-grammar https://github.com/JaneSmith/MyGrammar`. Please only add grammars that have [one of these licenses][licenses].
-0. Add samples for your language to the [samples directory][samples] in the correct subdirectory.
-0. Add a `language_id` for your language using `script/set-language-ids`. **You should only ever need to run `script/set-language-ids --update`. Anything other than this risks breaking GitHub search :cry:**
-0. Open a pull request, linking to a [GitHub search result](https://github.com/search?utf8=%E2%9C%93&q=extension%3Aboot+NOT+nothack&type=Code&ref=searchresults) showing in-the-wild usage.
+1. Add an entry for your language to [`languages.yml`][languages]. Omit the `language_id` field for now.
+1. Add a grammar for your language: `script/add-grammar https://github.com/JaneSmith/MyGrammar`. Please only add grammars that have [one of these licenses][licenses].
+1. Add samples for your language to the [samples directory][samples] in the correct subdirectory.
+1. Add a `language_id` for your language using `script/set-language-ids`. **You should only ever need to run `script/set-language-ids --update`. Anything other than this risks breaking GitHub search :cry:**
+1. Open a pull request, linking to a [GitHub search result](https://github.com/search?utf8=%E2%9C%93&q=extension%3Aboot+NOT+nothack&type=Code&ref=searchresults) showing in-the-wild usage.

 In addition, if your new language defines an extension that's already listed in [`languages.yml`][languages] (such as `.foo`) then sometimes a few more steps will need to be taken:

-0. Make sure that example `.foo` files are present in the [samples directory][samples] for each language that uses `.foo`.
-0. Test the performance of the Bayesian classifier with a relatively large number (1000s) of sample `.foo` files. (ping **@bkeepers** to help with this) to ensure we're not misclassifying files.
-0. If the Bayesian classifier does a bad job with the sample `.foo` files then a [heuristic](https://github.com/github/linguist/blob/master/lib/linguist/heuristics.rb) may need to be written to help.
+1. Make sure that example `.foo` files are present in the [samples directory][samples] for each language that uses `.foo`.
+1. Test the performance of the Bayesian classifier with a relatively large number (1000s) of sample `.foo` files. (ping **@bkeepers** to help with this) to ensure we're not misclassifying files.
+1. If the Bayesian classifier does a bad job with the sample `.foo` files then a [heuristic](https://github.com/github/linguist/blob/master/lib/linguist/heuristics.rb) may need to be written to help.

 Remember, the goal here is to try and avoid false positives!

@@ -80,12 +80,14 @@ Here's our current build status: [![Build Status](https://api.travis-ci.org/gith
 Linguist is maintained with :heart: by:

 - **@Alhadis**
- **@brandonblack** (GitHub staff)
+- **@BenEddy** (GitHub staff)
+- **@Caged** (GitHub staff)
+- **@grantr** (GitHub staff)
 - **@larsbrinkhoff**
 - **@lildude** (GitHub staff)
- **@lizzhale** (GitHub staff)
- **@mikemcquaid** (GitHub staff)
 - **@pchaigno**
+- **@rafer** (GitHub staff)
+- **@shreyasjoshis** (GitHub staff)

 As Linguist is a production dependency for GitHub we have a couple of workflow restrictions:

@@ -96,21 +98,21 @@ As Linguist is a production dependency for GitHub we have a couple of workflow r

 If you are the current maintainer of this gem:

-0. Create a branch for the release: `git checkout -b cut-release-vxx.xx.xx`
-0. Make sure your local dependencies are up to date: `script/bootstrap`
-0. If grammar submodules have not been updated recently, update them: `git submodule update --remote && git commit -a`
-0. Ensure that samples are updated: `bundle exec rake samples`
-0. Ensure that tests are green: `bundle exec rake test`
-0. Bump gem version in `lib/linguist/version.rb`, [like this](https://github.com/github/linguist/commit/8d2ea90a5ba3b2fe6e1508b7155aa4632eea2985).
-0. Make a PR to github/linguist, [like this](https://github.com/github/linguist/pull/1238).
-0. Build a local gem: `bundle exec rake build_gem`
-0. Test the gem:
-  0. Bump the Gemfile and Gemfile.lock versions for an app which relies on this gem
-  0. Install the new gem locally
-  0. Test behavior locally, branch deploy, whatever needs to happen
-0. Merge github/linguist PR
-0. Tag and push: `git tag vx.xx.xx; git push --tags`
-0. Push to rubygems.org -- `gem push github-linguist-3.0.0.gem`
+1. Create a branch for the release: `git checkout -b cut-release-vxx.xx.xx`
+1. Make sure your local dependencies are up to date: `script/bootstrap`
+1. If grammar submodules have not been updated recently, update them: `git submodule update --remote && git commit -a`
+1. Ensure that samples are updated: `bundle exec rake samples`
+1. Ensure that tests are green: `bundle exec rake test`
+1. Bump gem version in `lib/linguist/version.rb`, [like this](https://github.com/github/linguist/commit/8d2ea90a5ba3b2fe6e1508b7155aa4632eea2985).
+1. Make a PR to github/linguist, [like this](https://github.com/github/linguist/pull/1238).
+1. Build a local gem: `bundle exec rake build_gem`
+1. Test the gem:
+  1. Bump the Gemfile and Gemfile.lock versions for an app which relies on this gem
+  1. Install the new gem locally
+  1. Test behavior locally, branch deploy, whatever needs to happen
+1. Merge github/linguist PR
+1. Tag and push: `git tag vx.xx.xx; git push --tags`
+1. Push to rubygems.org -- `gem push github-linguist-3.0.0.gem`

 [grammars]: /grammars.yml
 [languages]: /lib/linguist/languages.yml
--- a/README.md
+++ b/README.md
@@ -15,10 +15,10 @@ See [Troubleshooting](#troubleshooting) and [`CONTRIBUTING.md`](/CONTRIBUTING.md

 The Language stats bar displays languages percentages for the files in the repository. The percentages are calculated based on the bytes of code for each language as reported by the [List Languages](https://developer.github.com/v3/repos/#list-languages) API. If the bar is reporting a language that you don't expect:

-0. Click on the name of the language in the stats bar to see a list of the files that are identified as that language.
-0. If you see files that you didn't write, consider moving the files into one of the [paths for vendored  code](/lib/linguist/vendor.yml), or use the [manual overrides](#overrides) feature to ignore them.
-0. If the files are being misclassified, search for [open issues][issues] to see if anyone else has already reported the issue. Any information you can add, especially links to public repositories, is helpful.
-0. If there are no reported issues of this misclassification, [open an issue][new-issue] and include a link to the repository or a sample of the code that is being misclassified.
+1. Click on the name of the language in the stats bar to see a list of the files that are identified as that language.
+1. If you see files that you didn't write, consider moving the files into one of the [paths for vendored  code](/lib/linguist/vendor.yml), or use the [manual overrides](#overrides) feature to ignore them.
+1. If the files are being misclassified, search for [open issues][issues] to see if anyone else has already reported the issue. Any information you can add, especially links to public repositories, is helpful.
+1. If there are no reported issues of this misclassification, [open an issue][new-issue] and include a link to the repository or a sample of the code that is being misclassified.

 ### There's a problem with the syntax highlighting of a file

@@ -32,13 +32,15 @@ Linguist supports a number of different custom overrides strategies for language

 ### Using gitattributes

-Add a `.gitattributes` file to your project and use standard git-style path matchers for the files you want to override to set `linguist-documentation`, `linguist-language`, and `linguist-vendored`. `.gitattributes` will be used to determine language statistics and will be used to syntax highlight files. You can also manually set syntax highlighting using [Vim or Emacs modelines](#using-emacs-or-vim-modelines).
+Add a `.gitattributes` file to your project and use standard git-style path matchers for the files you want to override to set `linguist-documentation`, `linguist-language`, `linguist-vendored`, and `linguist-generated`. `.gitattributes` will be used to determine language statistics and will be used to syntax highlight files. You can also manually set syntax highlighting using [Vim or Emacs modelines](#using-emacs-or-vim-modelines).

 ```
 $ cat .gitattributes
 *.rb linguist-language=Java
 ```

+#### Vendored code
+
 Checking code you didn't write, such as JavaScript libraries, into your git repo is a common practice, but this often inflates your project's language stats and may even cause your project to be labeled as another language. By default, Linguist treats all of the paths defined in [lib/linguist/vendor.yml](https://github.com/github/linguist/blob/master/lib/linguist/vendor.yml) as vendored and therefore doesn't include them in the language statistics for a repository.

 Use the `linguist-vendored` attribute to vendor or un-vendor paths.
@@ -49,6 +51,8 @@ special-vendored-path/* linguist-vendored
 jquery.js linguist-vendored=false
 ```

+#### Documentation
+
 Just like vendored files, Linguist excludes documentation files from your project's language stats. [lib/linguist/documentation.yml](lib/linguist/documentation.yml) lists common documentation paths and excludes them from the language statistics for your repository.

 Use the `linguist-documentation` attribute to mark or unmark paths as documentation.
@@ -59,15 +63,14 @@ project-docs/* linguist-documentation
 docs/formatter.rb linguist-documentation=false
 ```

-#### Generated file detection
+#### Generated code

 Not all plain text files are true source files. Generated files like minified js and compiled CoffeeScript can be detected and excluded from language stats. As an added bonus, unlike vendored and documentation files, these files are suppressed in diffs.

-```ruby
-Linguist::FileBlob.new("underscore.min.js").generated? # => true
 ```
-
-See [Linguist::Generated#generated?](https://github.com/github/linguist/blob/master/lib/linguist/generated.rb).
+$ cat .gitattributes
+Api.elm linguist-generated=true
+```

 ### Using Emacs or Vim modelines

--- a/1
+++ b/1
@@ -4,6 +4,7 @@ require 'rake/testtask'
 require 'yaml'
 require 'yajl'
 require 'open-uri'
+require 'json'

 task :default => :test

--- a/bin/linguist
+++ b/bin/linguist
@@ -75,7 +75,7 @@ elsif File.file?(path)
 else
  abort <<-HELP
  Linguist v#{Linguist::VERSION}
-  Detect language type for a file, or, given a directory, determine language breakdown.
+  Detect language type for a file, or, given a repository, determine language breakdown.

  Usage: linguist <path>
         linguist <path> [--breakdown] [--json]
--- a/grammars.yml
+++ b/grammars.yml
@@ -184,7 +184,7 @@ vendor/grammars/atom-language-1c-bsl:
 - source.sdbl
 vendor/grammars/atom-language-clean:
 - source.clean
- source.gfm.clean
+- text.restructuredtext.clean
 vendor/grammars/atom-language-p4:
 - source.p4
 vendor/grammars/atom-language-perl6:
@@ -410,6 +410,8 @@ vendor/grammars/language-jison:
 - source.jison
 - source.jisonlex
 - source.jisonlex-injection
+vendor/grammars/language-jolie:
+- source.jolie
 vendor/grammars/language-jsoniq:
 - source.jq
 - source.xq
--- a/lib/linguist.rb
+++ b/lib/linguist.rb
@@ -74,7 +74,7 @@ class << Linguist
  #       end
  #     end
  #
-  #     Linguist.instrumenter = CustomInstrumenter
+  #     Linguist.instrumenter = CustomInstrumenter.new
  #
  # The instrumenter must conform to the `ActiveSupport::Notifications`
  # interface, which defines `#instrument` and accepts:
--- a/lib/linguist/heuristics.rb
+++ b/lib/linguist/heuristics.rb
@@ -125,11 +125,18 @@ module Linguist
    end

    disambiguate ".d" do |data|
-      if /^module /.match(data)
+      # see http://dlang.org/spec/grammar
+      # ModuleDeclaration | ImportDeclaration | FuncDeclaration | unittest
+      if /^module\s+[\w.]*\s*;|import\s+[\w\s,.:]*;|\w+\s+\w+\s*\(.*\)(?:\(.*\))?\s*{[^}]*}|unittest\s*(?:\(.*\))?\s*{[^}]*}/.match(data)
        Language["D"]
-      elsif /^((dtrace:::)?BEGIN|provider |#pragma (D (option|attributes)|ident)\s)/.match(data)
+      # see http://dtrace.org/guide/chp-prog.html, http://dtrace.org/guide/chp-profile.html, http://dtrace.org/guide/chp-opt.html
+      elsif /^(\w+:\w*:\w*:\w*|BEGIN|END|provider\s+|(tick|profile)-\w+\s+{[^}]*}|#pragma\s+D\s+(option|attributes|depends_on)\s|#pragma\s+ident\s)/.match(data)
        Language["DTrace"]
-      elsif /(\/.*:( .* \\)$| : \\$|^ : |: \\$)/.match(data)
+      # path/target : dependency \
+      # target : \
+      #  : dependency
+      # path/file.ext1 : some/path/../file.ext2
+      elsif /([\/\\].*:\s+.*\s\\$|: \\$|^ : |^[\w\s\/\\.]+\w+\.\w+\s*:\s+[\w\s\/\\.]+\w+\.\w+)/.match(data)
        Language["Makefile"]
      end
    end
@@ -158,7 +165,7 @@ module Linguist
      elsif data.include?("flowop")
        Language["Filebench WML"]
      elsif fortran_rx.match(data)
-        Language["FORTRAN"]
+        Language["Fortran"]
      end
    end

@@ -166,7 +173,7 @@ module Linguist
      if /^: /.match(data)
        Language["Forth"]
      elsif fortran_rx.match(data)
-        Language["FORTRAN"]
+        Language["Fortran"]
      end
    end

@@ -219,7 +226,7 @@ module Linguist
      elsif /^(%[%{}]xs|<.*>)/.match(data)
        Language["Lex"]
      elsif /^\.[a-z][a-z](\s|$)/i.match(data)
-        Language["Groff"]
+        Language["Roff"]
      elsif /^\((de|class|rel|code|data|must)\s/.match(data)
        Language["PicoLisp"]
      end
@@ -263,7 +270,7 @@ module Linguist
      if /(^[-a-z0-9=#!\*\[|>])|<\//i.match(data) || data.empty?
        Language["Markdown"]
      elsif /^(;;|\(define_)/.match(data)
-        Language["GCC machine description"]
+        Language["GCC Machine Description"]
      else
        Language["Markdown"]
      end
@@ -289,9 +296,9 @@ module Linguist

    disambiguate ".ms" do |data|
      if /^[.'][a-z][a-z](\s|$)/i.match(data)
-        Language["Groff"]
+        Language["Roff"]
      elsif /(?<!\S)\.(include|globa?l)\s/.match(data) || /(?<!\/\*)(\A|\n)\s*\.[A-Za-z]/.match(data.gsub(/"([^\\"]|\\.)*"|'([^\\']|\\.)*'|\\\s*(?:--.*)?\n/, ""))
-        Language["GAS"]
+        Language["Unix Assembly"]
      else
        Language["MAXScript"]
      end
@@ -299,7 +306,7 @@ module Linguist

    disambiguate ".n" do |data|
      if /^[.']/.match(data)
-        Language["Groff"]
+        Language["Roff"]
      elsif /^(module|namespace|using)\s/.match(data)
        Language["Nemerle"]
      end
@@ -337,16 +344,16 @@ module Linguist
      end
    end

-    disambiguate ".pm", ".t" do |data|
-      if /use strict|use\s+v?5\./.match(data)
-        Language["Perl"]
-      elsif /^(use v6|(my )?class|module)/.match(data)
+    disambiguate ".pm" do |data|
+      if /^\s*(?:use\s+v6\s*;|(?:\bmy\s+)?class|module)\b/.match(data)
        Language["Perl6"]
+      elsif /\buse\s+(?:strict\b|v?5\.)/.match(data)
+        Language["Perl"]
      end
    end

    disambiguate ".pod" do |data|
-      if /^=\w+$/.match(data)
+      if /^=\w+\b/.match(data)
        Language["Pod"]
      else
        Language["Perl"]
@@ -385,7 +392,7 @@ module Linguist
      if /^\.!|^\.end lit(?:eral)?\b/i.match(data)
        Language["RUNOFF"]
      elsif /^\.\\" /.match(data)
-        Language["Groff"]
+        Language["Roff"]
      end
    end

@@ -436,10 +443,12 @@ module Linguist
    end
    
    disambiguate ".t" do |data|
-      if /^\s*%|^\s*var\s+\w+\s*:\s*\w+/.match(data)
+      if /^\s*%[ \t]+|^\s*var\s+\w+\s*:=\s*\w+/.match(data)
        Language["Turing"]
-      elsif /^\s*use\s+v6\s*;/.match(data)
+      elsif /^\s*(?:use\s+v6\s*;|\bmodule\b|\b(?:my\s+)?class\b)/.match(data)
        Language["Perl6"]
+      elsif /\buse\s+(?:strict\b|v?5\.)/.match(data)
+        Language["Perl"]
      end
    end
    
--- a/lib/linguist/languages.yml
+++ b/lib/linguist/languages.yml
@@ -2,7 +2,8 @@
 #
 # type              - Either data, programming, markup, prose, or nil
 # aliases           - An Array of additional aliases (implicitly
-#                     includes name.downcase)
+#                     includes the lowercase name with spaces replaced
+#                     by dashes)
 # ace_mode          - A String name of the Ace Mode used for highlighting whenever
 #                     a file is edited. This must match one of the filenames in http://git.io/3XO_Cg.
 #                     Use "text" if a mode does not exist.
@@ -1594,6 +1595,7 @@ HLSL:
  type: programming
  extensions:
  - ".hlsl"
+  - ".cginc"
  - ".fx"
  - ".fxh"
  - ".hlsli"
@@ -2039,6 +2041,17 @@ Jison Lex:
  tm_scope: source.jisonlex
  ace_mode: text
  language_id: 406395330
+Jolie:
+  type: programming
+  extensions:
+  - ".ol"
+  - ".iol"
+  interpreters:
+  - jolie
+  color: "#843179"
+  ace_mode: text
+  tm_scope: source.jolie
+  language_id: 998078858
 Julia:
  type: programming
  extensions:
@@ -2465,10 +2478,13 @@ Markdown:
  extensions:
  - ".md"
  - ".markdown"
+  - ".mdown"
+  - ".mdwn"
  - ".mkd"
  - ".mkdn"
  - ".mkdown"
  - ".ron"
+  - ".workbook"
  tm_scope: source.gfm
  language_id: 222
 Marko:
@@ -3044,12 +3060,21 @@ PLSQL:
  color: "#dad8d8"
  extensions:
  - ".pls"
+  - ".bdy"
+  - ".ddl"
+  - ".fnc"
  - ".pck"
  - ".pkb"
  - ".pks"
  - ".plb"
  - ".plsql"
+  - ".prc"
+  - ".spc"
  - ".sql"
+  - ".tpb"
+  - ".tps"
+  - ".trg"
+  - ".vw"
  language_id: 273
 PLpgSQL:
  type: programming
@@ -3404,6 +3429,7 @@ Python:
  - ".lmi"
  - ".py3"
  - ".pyde"
+  - ".pyi"
  - ".pyp"
  - ".pyt"
  - ".pyw"
@@ -3756,7 +3782,6 @@ Ruby:
  - ".fcgi"
  - ".gemspec"
  - ".god"
-  - ".irbrc"
  - ".jbuilder"
  - ".mspec"
  - ".pluginspec"
@@ -3778,6 +3803,7 @@ Ruby:
  - jruby
  - rbx
  filenames:
+  - ".irbrc"
  - ".pryrc"
  - Appraisals
  - Berksfile
@@ -3793,6 +3819,7 @@ Ruby:
  - Mavenfile
  - Podfile
  - Puppetfile
+  - Rakefile
  - Snapfile
  - Thorfile
  - Vagrantfile
@@ -4011,6 +4038,13 @@ Self:
  tm_scope: none
  ace_mode: text
  language_id: 345
+ShaderLab:
+  type: programming
+  extensions:
+  - ".shader"
+  ace_mode: text
+  tm_scope: source.shaderlab
+  language_id: 664257356
 Shell:
  type: programming
  color: "#89e051"
@@ -4678,6 +4712,8 @@ XML:
  - wsdl
  extensions:
  - ".xml"
+  - ".adml"
+  - ".admx"
  - ".ant"
  - ".axml"
  - ".builds"
@@ -4705,6 +4741,7 @@ XML:
  - ".kml"
  - ".launch"
  - ".mdpolicy"
+  - ".mjml"
  - ".mm"
  - ".mod"
  - ".mxml"
@@ -4743,7 +4780,9 @@ XML:
  - ".ux"
  - ".vbproj"
  - ".vcxproj"
+  - ".vsixmanifest"
  - ".vssettings"
+  - ".vstemplate"
  - ".vxml"
  - ".wixproj"
  - ".wsdl"
--- a/lib/linguist/version.rb
+++ b/lib/linguist/version.rb
@@ -1,3 +1,3 @@
 module Linguist
-  VERSION = "5.0.7"
+  VERSION = "5.0.10"
 end
--- a/samples/D/aa.d
+++ b/samples/D/aa.d
@@ -0,0 +1,440 @@
+/**
+ * Implementation of associative arrays.
+ *
+ * Copyright: Martin Nowak 2015 -.
+ * License:   $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
+ * Authors:   Martin Nowak
+ */
+module core.aa;
+
+import core.memory : GC;
+
+private
+{
+    // grow threshold
+    enum GROW_NUM = 4;
+    enum GROW_DEN = 5;
+    // shrink threshold
+    enum SHRINK_NUM = 1;
+    enum SHRINK_DEN = 8;
+    // grow factor
+    enum GROW_FAC = 4;
+    // growing the AA doubles it's size, so the shrink threshold must be
+    // smaller than half the grow threshold to have a hysteresis
+    static assert(GROW_FAC * SHRINK_NUM * GROW_DEN < GROW_NUM * SHRINK_DEN);
+    // initial load factor (for literals), mean of both thresholds
+    enum INIT_NUM = (GROW_DEN * SHRINK_NUM + GROW_NUM * SHRINK_DEN) / 2;
+    enum INIT_DEN = SHRINK_DEN * GROW_DEN;
+
+    // magic hash constants to distinguish empty, deleted, and filled buckets
+    enum HASH_EMPTY = 0;
+    enum HASH_DELETED = 0x1;
+    enum HASH_FILLED_MARK = size_t(1) << 8 * size_t.sizeof - 1;
+}
+
+enum INIT_NUM_BUCKETS = 8;
+
+struct AA(Key, Val)
+{
+    this(size_t sz)
+    {
+        impl = new Impl(nextpow2(sz));
+    }
+
+    @property bool empty() const pure nothrow @safe @nogc
+    {
+        return !length;
+    }
+
+    @property size_t length() const pure nothrow @safe @nogc
+    {
+        return impl is null ? 0 : impl.length;
+    }
+
+    void opIndexAssign(Val val, in Key key)
+    {
+        // lazily alloc implementation
+        if (impl is null)
+            impl = new Impl(INIT_NUM_BUCKETS);
+
+        // get hash and bucket for key
+        immutable hash = calcHash(key);
+
+        // found a value => assignment
+        if (auto p = impl.findSlotLookup(hash, key))
+        {
+            p.entry.val = val;
+            return;
+        }
+
+        auto p = findSlotInsert(hash);
+        if (p.deleted)
+            --deleted;
+        // check load factor and possibly grow
+        else if (++used * GROW_DEN > dim * GROW_NUM)
+        {
+            grow();
+            p = findSlotInsert(hash);
+            assert(p.empty);
+        }
+
+        // update search cache and allocate entry
+        firstUsed = min(firstUsed, cast(uint)(p - buckets.ptr));
+        p.hash = hash;
+        p.entry = new Impl.Entry(key, val); // TODO: move
+        return;
+    }
+
+    ref inout(Val) opIndex(in Key key) inout @trusted
+    {
+        auto p = opIn_r(key);
+        assert(p !is null);
+        return *p;
+    }
+
+    inout(Val)* opIn_r(in Key key) inout @trusted
+    {
+        if (empty)
+            return null;
+
+        immutable hash = calcHash(key);
+        if (auto p = findSlotLookup(hash, key))
+            return &p.entry.val;
+        return null;
+    }
+
+    bool remove(in Key key)
+    {
+        if (empty)
+            return false;
+
+        immutable hash = calcHash(key);
+        if (auto p = findSlotLookup(hash, key))
+        {
+            // clear entry
+            p.hash = HASH_DELETED;
+            p.entry = null;
+
+            ++deleted;
+            if (length * SHRINK_DEN < dim * SHRINK_NUM)
+                shrink();
+
+            return true;
+        }
+        return false;
+    }
+
+    Val get(in Key key, lazy Val val)
+    {
+        auto p = opIn_r(key);
+        return p is null ? val : *p;
+    }
+
+    ref Val getOrSet(in Key key, lazy Val val)
+    {
+        // lazily alloc implementation
+        if (impl is null)
+            impl = new Impl(INIT_NUM_BUCKETS);
+
+        // get hash and bucket for key
+        immutable hash = calcHash(key);
+
+        // found a value => assignment
+        if (auto p = impl.findSlotLookup(hash, key))
+            return p.entry.val;
+
+        auto p = findSlotInsert(hash);
+        if (p.deleted)
+            --deleted;
+        // check load factor and possibly grow
+        else if (++used * GROW_DEN > dim * GROW_NUM)
+        {
+            grow();
+            p = findSlotInsert(hash);
+            assert(p.empty);
+        }
+
+        // update search cache and allocate entry
+        firstUsed = min(firstUsed, cast(uint)(p - buckets.ptr));
+        p.hash = hash;
+        p.entry = new Impl.Entry(key, val);
+        return p.entry.val;
+    }
+
+    /**
+       Convert the AA to the type of the builtin language AA.
+     */
+    Val[Key] toBuiltinAA() pure nothrow
+    {
+        return cast(Val[Key]) _aaFromCoreAA(impl, rtInterface);
+    }
+
+private:
+
+    private this(inout(Impl)* impl) inout
+    {
+        this.impl = impl;
+    }
+
+    ref Val getLValue(in Key key)
+    {
+        // lazily alloc implementation
+        if (impl is null)
+            impl = new Impl(INIT_NUM_BUCKETS);
+
+        // get hash and bucket for key
+        immutable hash = calcHash(key);
+
+        // found a value => assignment
+        if (auto p = impl.findSlotLookup(hash, key))
+            return p.entry.val;
+
+        auto p = findSlotInsert(hash);
+        if (p.deleted)
+            --deleted;
+        // check load factor and possibly grow
+        else if (++used * GROW_DEN > dim * GROW_NUM)
+        {
+            grow();
+            p = findSlotInsert(hash);
+            assert(p.empty);
+        }
+
+        // update search cache and allocate entry
+        firstUsed = min(firstUsed, cast(uint)(p - buckets.ptr));
+        p.hash = hash;
+        p.entry = new Impl.Entry(key); // TODO: move
+        return p.entry.val;
+    }
+
+    static struct Impl
+    {
+        this(size_t sz)
+        {
+            buckets = allocBuckets(sz);
+        }
+
+        @property size_t length() const pure nothrow @nogc
+        {
+            assert(used >= deleted);
+            return used - deleted;
+        }
+
+        @property size_t dim() const pure nothrow @nogc
+        {
+            return buckets.length;
+        }
+
+        @property size_t mask() const pure nothrow @nogc
+        {
+            return dim - 1;
+        }
+
+        // find the first slot to insert a value with hash
+        inout(Bucket)* findSlotInsert(size_t hash) inout pure nothrow @nogc
+        {
+            for (size_t i = hash & mask, j = 1;; ++j)
+            {
+                if (!buckets[i].filled)
+                    return &buckets[i];
+                i = (i + j) & mask;
+            }
+        }
+
+        // lookup a key
+        inout(Bucket)* findSlotLookup(size_t hash, in Key key) inout
+        {
+            for (size_t i = hash & mask, j = 1;; ++j)
+            {
+                if (buckets[i].hash == hash && key == buckets[i].entry.key)
+                    return &buckets[i];
+                else if (buckets[i].empty)
+                    return null;
+                i = (i + j) & mask;
+            }
+        }
+
+        void grow()
+        {
+            // If there are so many deleted entries, that growing would push us
+            // below the shrink threshold, we just purge deleted entries instead.
+            if (length * SHRINK_DEN < GROW_FAC * dim * SHRINK_NUM)
+                resize(dim);
+            else
+                resize(GROW_FAC * dim);
+        }
+
+        void shrink()
+        {
+            if (dim > INIT_NUM_BUCKETS)
+                resize(dim / GROW_FAC);
+        }
+
+        void resize(size_t ndim) pure nothrow
+        {
+            auto obuckets = buckets;
+            buckets = allocBuckets(ndim);
+
+            foreach (ref b; obuckets)
+                if (b.filled)
+                    *findSlotInsert(b.hash) = b;
+
+            firstUsed = 0;
+            used -= deleted;
+            deleted = 0;
+            GC.free(obuckets.ptr); // safe to free b/c impossible to reference
+        }
+
+        static struct Entry
+        {
+            Key key;
+            Val val;
+        }
+
+        static struct Bucket
+        {
+            size_t hash;
+            Entry* entry;
+
+            @property bool empty() const
+            {
+                return hash == HASH_EMPTY;
+            }
+
+            @property bool deleted() const
+            {
+                return hash == HASH_DELETED;
+            }
+
+            @property bool filled() const
+            {
+                return cast(ptrdiff_t) hash < 0;
+            }
+        }
+
+        Bucket[] allocBuckets(size_t dim) @trusted pure nothrow
+        {
+            enum attr = GC.BlkAttr.NO_INTERIOR;
+            immutable sz = dim * Bucket.sizeof;
+            return (cast(Bucket*) GC.calloc(sz, attr))[0 .. dim];
+        }
+
+        Bucket[] buckets;
+        uint used;
+        uint deleted;
+        uint firstUsed;
+    }
+
+    RTInterface* rtInterface()() pure nothrow @nogc
+    {
+        static size_t aaLen(in void* pimpl) pure nothrow @nogc
+        {
+            auto aa = const(AA)(cast(const(Impl)*) pimpl);
+            return aa.length;
+        }
+
+        static void* aaGetY(void** pimpl, in void* pkey)
+        {
+            auto aa = AA(cast(Impl*)*pimpl);
+            auto res = &aa.getLValue(*cast(const(Key*)) pkey);
+            *pimpl = aa.impl; // might have changed
+            return res;
+        }
+
+        static inout(void)* aaInX(inout void* pimpl, in void* pkey)
+        {
+            auto aa = inout(AA)(cast(inout(Impl)*) pimpl);
+            return aa.opIn_r(*cast(const(Key*)) pkey);
+        }
+
+        static bool aaDelX(void* pimpl, in void* pkey)
+        {
+            auto aa = AA(cast(Impl*) pimpl);
+            return aa.remove(*cast(const(Key*)) pkey);
+        }
+
+        static immutable vtbl = RTInterface(&aaLen, &aaGetY, &aaInX, &aaDelX);
+        return cast(RTInterface*)&vtbl;
+    }
+
+    static size_t calcHash(in ref Key key)
+    {
+        return hashOf(key) | HASH_FILLED_MARK;
+    }
+
+    Impl* impl;
+    alias impl this;
+}
+
+package extern (C) void* _aaFromCoreAA(void* impl, RTInterface* rtIntf) pure nothrow;
+
+private:
+
+struct RTInterface
+{
+    alias AA = void*;
+
+    size_t function(in AA aa) pure nothrow @nogc len;
+    void* function(AA* aa, in void* pkey) getY;
+    inout(void)* function(inout AA aa, in void* pkey) inX;
+    bool function(AA aa, in void* pkey) delX;
+}
+
+unittest
+{
+    AA!(int, int) aa;
+    assert(aa.length == 0);
+    aa[0] = 1;
+    assert(aa.length == 1 && aa[0] == 1);
+    aa[1] = 2;
+    assert(aa.length == 2 && aa[1] == 2);
+    import core.stdc.stdio;
+
+    int[int] rtaa = aa.toBuiltinAA();
+    assert(rtaa.length == 2);
+    puts("length");
+    assert(rtaa[0] == 1);
+    assert(rtaa[1] == 2);
+    rtaa[2] = 3;
+
+    assert(aa[2] == 3);
+}
+
+unittest
+{
+    auto aa = AA!(int, int)(3);
+    aa[0] = 0;
+    aa[1] = 1;
+    aa[2] = 2;
+    assert(aa.length == 3);
+}
+
+//==============================================================================
+// Helper functions
+//------------------------------------------------------------------------------
+
+size_t nextpow2(in size_t n) pure nothrow @nogc
+{
+    import core.bitop : bsr;
+
+    if (n < 2)
+        return 1;
+    return size_t(1) << bsr(n - 1) + 1;
+}
+
+pure nothrow @nogc unittest
+{
+    //                            0, 1, 2, 3, 4, 5, 6, 7, 8,  9
+    foreach (const n, const pow2; [1, 1, 2, 4, 4, 8, 8, 8, 8, 16])
+        assert(nextpow2(n) == pow2);
+}
+
+T min(T)(T a, T b) pure nothrow @nogc
+{
+    return a < b ? a : b;
+}
+
+T max(T)(T a, T b) pure nothrow @nogc
+{
+    return b < a ? a : b;
+}
--- a/samples/D/arrayops.d
+++ b/samples/D/arrayops.d
@@ -0,0 +1,187 @@
+/**
+ * Benchmark for array ops.
+ *
+ * Copyright: Copyright Martin Nowak 2016 -.
+ * License:   $(LINK2 http://www.boost.org/LICENSE_1_0.txt, Boost License 1.0)
+ * Authors:   Martin Nowak
+ */
+import core.cpuid, std.algorithm, std.datetime, std.meta, std.stdio, std.string,
+    std.range;
+
+float[6] getLatencies(T, string op)()
+{
+    enum N = (64 * (1 << 6) + 64) * T.sizeof;
+    auto a = Array!T(N), b = Array!T(N), c = Array!T(N);
+    float[6] latencies = float.max;
+    foreach (i, ref latency; latencies)
+    {
+        auto len = 1 << i;
+        foreach (_; 1 .. 32)
+        {
+            a[] = 24;
+            b[] = 4;
+            c[] = 2;
+            auto sw = StopWatch(AutoStart.yes);
+            foreach (off; size_t(0) .. size_t(64))
+            {
+                off = off * len + off;
+                enum op = op.replace("const", "2").replace("a",
+                        "a[off .. off + len]").replace("b",
+                        "b[off .. off + len]").replace("c", "c[off .. off + len]");
+                mixin(op ~ ";");
+            }
+            latency = min(latency, sw.peek.nsecs);
+        }
+    }
+    float[6] res = latencies[] / 1024;
+    return res;
+}
+
+float[4] getThroughput(T, string op)()
+{
+    enum N = (40 * 1024 * 1024 + 64 * T.sizeof) / T.sizeof;
+    auto a = Array!T(N), b = Array!T(N), c = Array!T(N);
+    float[4] latencies = float.max;
+    size_t[4] lengths = [
+        8 * 1024 / T.sizeof, 32 * 1024 / T.sizeof, 512 * 1024 / T.sizeof, 32 * 1024 * 1024 / T
+        .sizeof
+    ];
+    foreach (i, ref latency; latencies)
+    {
+        auto len = lengths[i] / 64;
+        foreach (_; 1 .. 4)
+        {
+            a[] = 24;
+            b[] = 4;
+            c[] = 2;
+            auto sw = StopWatch(AutoStart.yes);
+            foreach (off; size_t(0) .. size_t(64))
+            {
+                off = off * len + off;
+                enum op = op.replace("const", "2").replace("a",
+                        "a[off .. off + len]").replace("b",
+                        "b[off .. off + len]").replace("c", "c[off .. off + len]");
+                mixin(op ~ ";");
+            }
+            immutable nsecs = sw.peek.nsecs;
+            runMasked({latency = min(latency, nsecs);});
+        }
+    }
+    float[4] throughputs = void;
+    runMasked({throughputs = T.sizeof * lengths[] / latencies[];});
+    return throughputs;
+}
+
+string[] genOps()
+{
+    string[] ops;
+    foreach (op1; ["+", "-", "*", "/"])
+    {
+        ops ~= "a " ~ op1 ~ "= b";
+        ops ~= "a " ~ op1 ~ "= const";
+        foreach (op2; ["+", "-", "*", "/"])
+        {
+            ops ~= "a " ~ op1 ~ "= b " ~ op2 ~ " c";
+            ops ~= "a " ~ op1 ~ "= b " ~ op2 ~ " const";
+        }
+    }
+    return ops;
+}
+
+void runOp(string op)()
+{
+    foreach (T; AliasSeq!(ubyte, ushort, uint, ulong, byte, short, int, long, float,
+            double))
+        writefln("%s, %s, %(%.2f, %), %(%s, %)", T.stringof, op,
+            getLatencies!(T, op), getThroughput!(T, op));
+}
+
+struct Array(T)
+{
+    import core.stdc.stdlib : free, malloc;
+
+    this(size_t n)
+    {
+        ary = (cast(T*) malloc(T.sizeof * n))[0 .. n];
+    }
+
+    ~this()
+    {
+        free(ary.ptr);
+    }
+
+    T[] ary;
+    alias ary this;
+}
+
+version (X86)
+    version = SSE;
+else version (X86_64)
+    version = SSE;
+else
+    static assert(0, "unimplemented");
+
+version (SSE)
+{
+    uint mxcsr()
+    {
+        uint ret = void;
+        asm
+        {
+            stmxcsr ret;
+        }
+        return ret;
+    }
+
+    void mxcsr(uint val)
+    {
+        asm
+        {
+            ldmxcsr val;
+        }
+    }
+
+    // http://softpixel.com/~cwright/programming/simd/sse.php
+    enum FPU_EXCEPTION_MASKS = 1 << 12 | 1 << 11 | 1 << 10 | 1 << 9 | 1 << 8 | 1 << 7;
+    enum FPU_EXCEPTION_FLAGS = 1 << 5 | 1 << 4 | 1 << 3 | 1 << 2 | 1 << 1 | 1 << 0;
+
+    void maskFPUExceptions()
+    {
+        mxcsr = mxcsr | FPU_EXCEPTION_MASKS;
+    }
+
+    void unmaskFPUExceptions()
+    {
+        mxcsr = mxcsr & ~FPU_EXCEPTION_MASKS;
+    }
+
+    uint FPUExceptionFlags()
+    {
+        return mxcsr & FPU_EXCEPTION_FLAGS;
+    }
+
+    void clearFPUExceptionFlags()
+    {
+        mxcsr = mxcsr & ~FPU_EXCEPTION_FLAGS;
+    }
+}
+
+void runMasked(scope void delegate() dg)
+{
+    assert(FPUExceptionFlags == 0);
+    maskFPUExceptions;
+    dg();
+    clearFPUExceptionFlags;
+    unmaskFPUExceptions;
+}
+
+void main()
+{
+    unmaskFPUExceptions;
+
+    writefln("type, op, %(latency%s, %), %-(throughput%s, %)", iota(6)
+        .map!(i => 1 << i), ["8KB", "32KB", "512KB", "32MB"]);
+    foreach (op; mixin("AliasSeq!(%(%s, %))".format(genOps)))
+        runOp!op;
+    maskFPUExceptions;
+}
--- a/samples/D/function.d
+++ b/samples/D/function.d
@@ -0,0 +1,3 @@
+void foo()
+{
+}
--- a/samples/D/hello_world.d
+++ b/samples/D/hello_world.d
@@ -0,0 +1,6 @@
+import std.stdio;
+
+void main()
+{
+    writeln("Hello World");
+}
--- a/samples/D/template.d
+++ b/samples/D/template.d
@@ -0,0 +1,7 @@
+template Fib(size_t N)
+{
+    static if (N < 2)
+        enum Fib = size_t(1);
+    else
+        enum Fib = Fib!(N - 2) + Fib!(N - 1);
+}
--- a/samples/D/template_function.d
+++ b/samples/D/template_function.d
@@ -0,0 +1,3 @@
+void bar(T)(T t)
+{
+}
--- a/samples/D/unittest1.d
+++ b/samples/D/unittest1.d
@@ -0,0 +1,3 @@
+unittest
+{
+}
--- a/samples/D/unittest2.d
+++ b/samples/D/unittest2.d
@@ -0,0 +1,3 @@
+unittest("optional name")
+{
+}
--- a/samples/GLSL/SyLens.shader
+++ b/samples/GLSL/SyLens.shader
@@ -0,0 +1,161 @@
+#version 120
+
+/*
+  Original Lens Distortion Algorithm from SSontech (Syntheyes)
+  http://www.ssontech.com/content/lensalg.htm
+  
+  r2 is radius squared.
+  
+  r2 = image_aspect*image_aspect*u*u + v*v
+  f = 1 + r2*(k + kcube*sqrt(r2))
+  u' = f*u
+  v' = f*v
+
+*/
+
+// Controls
+uniform float kCoeff, kCube, uShift, vShift;
+uniform float chroma_red, chroma_green, chroma_blue;
+uniform bool apply_disto;
+
+// Uniform inputs
+uniform sampler2D input1;
+uniform float adsk_input1_w, adsk_input1_h, adsk_input1_aspect, adsk_input1_frameratio;
+uniform float adsk_result_w, adsk_result_h;
+
+float distortion_f(float r) {
+    float f = 1 + (r*r)*(kCoeff + kCube * r);
+    return f;
+}
+
+
+float inverse_f(float r)
+{
+    
+    // Build a lookup table on the radius, as a fixed-size table.
+    // We will use a vec3 since we will store the multipled number in the Z coordinate.
+    // So to recap: x will be the radius, y will be the f(x) distortion, and Z will be x * y;
+    vec3[48] lut;
+    
+    // Since out LUT is shader-global check if it's been computed alrite
+    // Flame has no overflow bbox so we can safely max out at the image edge, plus some cushion
+    float max_r = sqrt((adsk_input1_frameratio * adsk_input1_frameratio) + 1) + 0.1;
+    float incr = max_r / 48;
+    float lut_r = 0;
+    float f;
+    for(int i=0; i < 48; i++) {
+        f = distortion_f(lut_r);
+        lut[i] = vec3(lut_r, f, lut_r * f);
+        lut_r += incr;
+    }
+    
+    float t;
+    // Now find the nehgbouring elements
+    // only iterate to 46 since we will need
+    // 47 as i+1
+    for(int i=0; i < 47; i++) {
+        if(lut[i].z < r && lut[i+1].z > r) {
+            // BAM! our value is between these two segments
+            // get the T interpolant and mix
+            t = (r - lut[i].z) / (lut[i+1].z - lut[i]).z;
+            return mix(lut[i].y, lut[i+1].y, t );
+        }
+    }
+}
+
+float aberrate(float f, float chroma)
+{
+   return f + (f * chroma);
+}
+
+vec3 chromaticize_and_invert(float f)
+{
+   vec3 rgb_f = vec3(aberrate(f, chroma_red), aberrate(f, chroma_green), aberrate(f, chroma_blue));
+   // We need to DIVIDE by F when we redistort, and x / y == x * (1 / y)
+   if(apply_disto) {
+      rgb_f = 1 / rgb_f;
+   }
+   return rgb_f;
+}
+
+void main(void)
+{
+   vec2 px, uv;
+   float f = 1;
+   float r = 1;
+   
+   px = gl_FragCoord.xy;
+   
+   // Make sure we are still centered
+   px.x -= (adsk_result_w - adsk_input1_w) / 2;
+   px.y -= (adsk_result_h - adsk_input1_h) / 2;
+   
+   // Push the destination coordinates into the [0..1] range
+   uv.x = px.x / adsk_input1_w;
+   uv.y = px.y / adsk_input1_h;
+   
+       
+   // And to Syntheyes UV which are [1..-1] on both X and Y
+   uv.x = (uv.x *2 ) - 1;
+   uv.y = (uv.y *2 ) - 1;
+   
+   // Add UV shifts
+   uv.x += uShift;
+   uv.y += vShift;
+   
+   // Make the X value the aspect value, so that the X coordinates go to [-aspect..aspect]
+   uv.x = uv.x * adsk_input1_frameratio;
+   
+   // Compute the radius
+   r = sqrt(uv.x*uv.x + uv.y*uv.y);
+   
+   // If we are redistorting, account for the oversize plate in the input, assume that
+   // the input aspect is the same
+   if(apply_disto) {
+       r = r / (float(adsk_input1_w) / float(adsk_result_w));
+   }
+   
+   // Apply or remove disto, per channel honoring chromatic aberration
+   if(apply_disto) {
+      f = inverse_f(r);
+   } else {
+      f = distortion_f(r);
+   }
+   
+   vec2[3] rgb_uvs = vec2[](uv, uv, uv);
+   
+   // Compute distortions per component
+   vec3 rgb_f = chromaticize_and_invert(f);
+   
+   // Apply the disto coefficients, per component
+   rgb_uvs[0] = rgb_uvs[0] * rgb_f.rr;
+   rgb_uvs[1] = rgb_uvs[1] * rgb_f.gg;
+   rgb_uvs[2] = rgb_uvs[2] * rgb_f.bb;
+   
+   // Convert all the UVs back to the texture space, per color component
+   for(int i=0; i < 3; i++) {
+       uv = rgb_uvs[i];
+       
+       // Back from [-aspect..aspect] to [-1..1]
+       uv.x = uv.x / adsk_input1_frameratio;
+       
+       // Remove UV shifts
+       uv.x -= uShift;
+       uv.y -= vShift;
+       
+       // Back to OGL UV
+       uv.x = (uv.x + 1) / 2;
+       uv.y = (uv.y + 1) / 2;
+       
+       rgb_uvs[i] = uv;
+   }
+   
+   // Sample the input plate, per component
+   vec4 sampled;
+   sampled.r = texture2D(input1, rgb_uvs[0]).r;
+   sampled.g = texture2D(input1, rgb_uvs[1]).g;
+   sampled.b = texture2D(input1, rgb_uvs[2]).b;
+   
+   // and assign to the output
+   gl_FragColor.rgba = vec4(sampled.rgb, 1.0 );
+}
--- a/samples/GLSL/islandScene.shader
+++ b/samples/GLSL/islandScene.shader
@@ -0,0 +1,630 @@
+//// High quality (Some browsers may freeze or crash)
+//#define HIGHQUALITY
+
+//// Medium quality (Should be fine on all systems, works on Intel HD2000 on Win7 but quite slow)
+//#define MEDIUMQUALITY
+
+//// Defaults
+//#define REFLECTIONS
+#define SHADOWS
+//#define GRASS
+//#define SMALL_WAVES
+#define RAGGED_LEAVES
+//#define DETAILED_NOISE
+//#define LIGHT_AA // 2 sample SSAA
+//#define HEAVY_AA // 2x2 RG SSAA
+//#define TONEMAP
+
+//// Configurations
+#ifdef MEDIUMQUALITY
+	#define SHADOWS
+	#define SMALL_WAVES
+	#define RAGGED_LEAVES
+	#define TONEMAP
+#endif
+
+#ifdef HIGHQUALITY
+	#define REFLECTIONS
+	#define SHADOWS
+	//#define GRASS
+	#define SMALL_WAVES
+	#define RAGGED_LEAVES
+	#define DETAILED_NOISE
+	#define LIGHT_AA
+	#define TONEMAP
+#endif
+
+// Constants
+const float eps = 1e-5;
+const float PI = 3.14159265359;
+
+const vec3 sunDir = vec3(0.79057,-0.47434, 0.0);
+const vec3 skyCol = vec3(0.3, 0.5, 0.8);
+const vec3 sandCol = vec3(0.9, 0.8, 0.5);
+const vec3 treeCol = vec3(0.8, 0.65, 0.3);
+const vec3 grassCol = vec3(0.4, 0.5, 0.18);
+const vec3 leavesCol = vec3(0.3, 0.6, 0.2);
+const vec3 leavesPos = vec3(-5.1,13.4, 0.0);
+
+#ifdef TONEMAP
+const vec3 sunCol = vec3(1.8, 1.7, 1.6);
+#else
+const vec3 sunCol = vec3(0.9, 0.85, 0.8);
+#endif
+
+const float exposure = 1.1; // Only used when tonemapping
+
+// Description : Array and textureless GLSL 2D/3D/4D simplex
+// noise functions.
+// Author : Ian McEwan, Ashima Arts.
+// License : Copyright (C) 2011 Ashima Arts. All rights reserved.
+// Distributed under the MIT License. See LICENSE file.
+// https://github.com/ashima/webgl-noise
+vec3 mod289(vec3 x) {
+  return x - floor(x * (1.0 / 289.0)) * 289.0;
+}
+
+vec4 mod289(vec4 x) {
+  return x - floor(x * (1.0 / 289.0)) * 289.0;
+}
+
+vec4 permute(vec4 x) {
+     return mod289(((x*34.0)+1.0)*x);
+}
+
+vec4 taylorInvSqrt(vec4 r) {
+  return 1.79284291400159 - 0.85373472095314 * r;
+}
+
+float snoise(vec3 v) {
+  const vec2 C = vec2(1.0/6.0, 1.0/3.0) ;
+  const vec4 D = vec4(0.0, 0.5, 1.0, 2.0);
+
+// First corner
+  vec3 i = floor(v + dot(v, C.yyy) );
+  vec3 x0 = v - i + dot(i, C.xxx) ;
+
+// Other corners
+  vec3 g = step(x0.yzx, x0.xyz);
+  vec3 l = 1.0 - g;
+  vec3 i1 = min( g.xyz, l.zxy );
+  vec3 i2 = max( g.xyz, l.zxy );
+
+  // x0 = x0 - 0.0 + 0.0 * C.xxx;
+  // x1 = x0 - i1 + 1.0 * C.xxx;
+  // x2 = x0 - i2 + 2.0 * C.xxx;
+  // x3 = x0 - 1.0 + 3.0 * C.xxx;
+  vec3 x1 = x0 - i1 + C.xxx;
+  vec3 x2 = x0 - i2 + C.yyy; // 2.0*C.x = 1/3 = C.y
+  vec3 x3 = x0 - D.yyy; // -1.0+3.0*C.x = -0.5 = -D.y
+
+// Permutations
+  i = mod289(i);
+  vec4 p = permute( permute( permute(
+             i.z + vec4(0.0, i1.z, i2.z, 1.0 ))
+           + i.y + vec4(0.0, i1.y, i2.y, 1.0 ))
+           + i.x + vec4(0.0, i1.x, i2.x, 1.0 ));
+
+// Gradients: 7x7 points over a square, mapped onto an octahedron.
+// The ring size 17*17 = 289 is close to a multiple of 49 (49*6 = 294)
+  float n_ = 0.142857142857; // 1.0/7.0
+  vec3 ns = n_ * D.wyz - D.xzx;
+
+  vec4 j = p - 49.0 * floor(p * ns.z * ns.z); // mod(p,7*7)
+
+  vec4 x_ = floor(j * ns.z);
+  vec4 y_ = floor(j - 7.0 * x_ ); // mod(j,N)
+
+  vec4 x = x_ *ns.x + ns.yyyy;
+  vec4 y = y_ *ns.x + ns.yyyy;
+  vec4 h = 1.0 - abs(x) - abs(y);
+
+  vec4 b0 = vec4( x.xy, y.xy );
+  vec4 b1 = vec4( x.zw, y.zw );
+
+  //vec4 s0 = vec4(lessThan(b0,0.0))*2.0 - 1.0;
+  //vec4 s1 = vec4(lessThan(b1,0.0))*2.0 - 1.0;
+  vec4 s0 = floor(b0)*2.0 + 1.0;
+  vec4 s1 = floor(b1)*2.0 + 1.0;
+  vec4 sh = -step(h, vec4(0.0));
+
+  vec4 a0 = b0.xzyw + s0.xzyw*sh.xxyy ;
+  vec4 a1 = b1.xzyw + s1.xzyw*sh.zzww ;
+
+  vec3 p0 = vec3(a0.xy,h.x);
+  vec3 p1 = vec3(a0.zw,h.y);
+  vec3 p2 = vec3(a1.xy,h.z);
+  vec3 p3 = vec3(a1.zw,h.w);
+
+//Normalise gradients
+  vec4 norm = taylorInvSqrt(vec4(dot(p0,p0), dot(p1,p1), dot(p2, p2), dot(p3,p3)));
+  p0 *= norm.x;
+  p1 *= norm.y;
+  p2 *= norm.z;
+  p3 *= norm.w;
+
+// Mix final noise value
+  vec4 m = max(0.6 - vec4(dot(x0,x0), dot(x1,x1), dot(x2,x2), dot(x3,x3)), 0.0);
+  m = m * m;
+  return 42.0 * dot( m*m, vec4( dot(p0,x0), dot(p1,x1),
+                                dot(p2,x2), dot(p3,x3) ) );
+}
+
+
+
+// Main
+float fbm(vec3 p)
+{
+	float final = snoise(p); 
+	p *= 1.94; final += snoise(p) * 0.5;
+	#ifdef DETAILED_NOISE
+	p *= 3.75; final += snoise(p) * 0.25;
+	return final / 1.75;
+	#else
+	return final / 1.5;
+	#endif
+}
+
+float waterHeight(vec3 p)
+{
+	float d = length(p.xz);
+	float h = sin(d * 1.5 + iGlobalTime * 3.0) * 12.0 / d; // Island waves
+	#ifdef SMALL_WAVES
+	h += fbm(p*0.5); // Other waves
+	#endif
+	return h;
+}
+
+vec3 bump(vec3 pos, vec3 rayDir)
+{
+	float s = 2.0;
+	
+	// Fade out waves to reduce aliasing
+	float dist = dot(pos, rayDir);
+	s *= dist < 2.0 ? 1.0 : 1.4142 / sqrt(dist);
+	
+	// Calculate normal from heightmap
+	vec2 e = vec2(1e-2, 0.0);
+	vec3 p = vec3(pos.x, iGlobalTime*0.5, pos.z)*0.7;
+	float m = waterHeight(p)*s;
+	return normalize(vec3(
+		waterHeight(p+e.xyy)*s-m,
+		1.0,
+		waterHeight(p+e.yxy)*s-m
+	));
+}
+
+// Ray intersections
+vec4 intersectSphere(vec3 rpos, vec3 rdir, vec3 pos, float rad)
+{
+	vec3 op = pos - rpos;
+	float b = dot(op, rdir); 
+	float det = b*b - dot(op, op) + rad*rad; 
+		
+	if (det > 0.0)
+	{
+		det = sqrt(det);
+		float t = b - det;
+		if (t > eps)
+			return vec4(-normalize(rpos+rdir*t-pos), t);
+	}
+	
+	return vec4(0.0);
+}
+
+vec4 intersectCylinder(vec3 rpos, vec3 rdir, vec3 pos, float rad)
+{
+	vec3 op = pos - rpos;
+	vec2 rdir2 = normalize(rdir.yz);
+	float b = dot(op.yz, rdir2);
+	float det = b*b - dot(op.yz, op.yz) + rad*rad; 
+	
+	if (det > 0.0)
+	{
+		det = sqrt(det);
+		float t = b - det;
+		if (t > eps)
+			return vec4(-normalize(rpos.yz+rdir2*t-pos.yz), 0.0, t);
+		t = b + det;
+		if (t > eps)
+			return vec4(-normalize(rpos.yz+rdir2*t-pos.yz), 0.0, t);
+	}
+	
+	return vec4(0.0);
+}
+
+vec4 intersectPlane(vec3 rayPos, vec3 rayDir, vec3 n, float d)
+{
+	float t = -(dot(rayPos, n) + d) / dot(rayDir, n);
+	return vec4(n * sign(dot(rayDir, n)), t);
+}
+
+// Helper functions
+vec3 rotate(vec3 p, float theta)
+{
+	float c = cos(theta), s = sin(theta);
+	return vec3(p.x * c + p.z * s, p.y,
+				p.z * c - p.x * s);
+}
+
+float impulse(float k, float x) // by iq
+{
+    float h = k*x;
+    return h * exp(1.0 - h);
+}
+
+// Raymarched parts of scene
+float grass(vec3 pos)
+{
+	float h = length(pos - vec3(0.0, -7.0, 0.0)) - 8.0;
+	
+	if (h > 2.0) return h; // Optimization (Avoid noise if too far away)
+	
+	return h + snoise(pos * 3.0) * 0.1 + pos.y * 0.9;
+}
+
+float tree(vec3 pos)
+{
+	pos.y -= 0.5;
+	float s = sin(pos.y*0.03);
+	float c = cos(pos.y*0.03);
+	mat2 m = mat2(c, -s, s, c);
+	vec3 p = vec3(m*pos.xy, pos.z);
+	
+	float width = 1.0 - pos.y * 0.02 - clamp(sin(pos.y * 8.0) * 0.1, 0.05, 0.1);
+	
+	return max(length(p.xz) - width, pos.y - 12.5);
+}
+
+vec2 scene(vec3 pos)
+{
+	float vtree = tree(pos);
+	#ifdef GRASS
+	float vgrass = grass(pos);
+	float v = min(vtree, vgrass);
+	#else
+	float v = vtree;
+	#endif
+	return vec2(v, v == vtree ? 2.0 : 1.0);
+}
+
+vec3 normal(vec3 pos)
+{
+	vec2 eps = vec2(1e-3, 0.0);
+	float h = scene(pos).x;
+	return normalize(vec3(
+		scene(pos-eps.xyy).x-h,
+		scene(pos-eps.yxy).x-h,
+		scene(pos-eps.yyx).x-h
+	));
+}
+
+float plantsShadow(vec3 rayPos, vec3 rayDir)
+{
+	// Soft shadow taken from iq
+	float k = 6.0;
+	float t = 0.0;
+	float s = 1.0;	
+	for (int i = 0; i < 30; i++)
+	{
+		vec3 pos = rayPos+rayDir*t;	
+		vec2 res = scene(pos);		
+		if (res.x < 0.001) return 0.0;
+		s = min(s, k*res.x/t); 
+		t += max(res.x, 0.01);
+	}
+	
+	return s*s*(3.0 - 2.0*s);
+}
+
+// Ray-traced parts of scene
+vec4 intersectWater(vec3 rayPos, vec3 rayDir)
+{
+	float h = sin(20.5 + iGlobalTime * 2.0) * 0.03;
+	float t = -(rayPos.y + 2.5 + h) / rayDir.y;
+	return vec4(0.0, 1.0, 0.0, t);
+}
+
+vec4 intersectSand(vec3 rayPos, vec3 rayDir)
+{
+	return intersectSphere(rayPos, rayDir, vec3(0.0,-24.1,0.0), 24.1);
+}
+
+vec4 intersectTreasure(vec3 rayPos, vec3 rayDir)
+{
+	return vec4(0.0);
+}
+
+vec4 intersectLeaf(vec3 rayPos, vec3 rayDir, float openAmount)
+{	
+	vec3 dir = normalize(vec3(0.0, 1.0, openAmount));
+	float offset = 0.0;
+			
+	vec4 res = intersectPlane(rayPos, rayDir, dir, 0.0);
+	vec3 pos = rayPos+rayDir*res.w;
+	#ifdef RAGGED_LEAVES
+	offset = snoise(pos*0.8) * 0.3;
+	#endif
+	if (pos.y > 0.0 || length(pos * vec3(0.9, 2.0, 1.0)) > 4.0 - offset) res.w = 0.0;
+	
+	vec4 res2 = intersectPlane(rayPos, rayDir, vec3(dir.xy, -dir.z), 0.0);
+	pos = rayPos+rayDir*res2.w;
+	#ifdef RAGGED_LEAVES
+	offset = snoise(pos*0.8) * 0.3;
+	#endif
+	if (pos.y > 0.0 || length(pos * vec3(0.9, 2.0, 1.0)) > 4.0 - offset) res2.w = 0.0;
+	
+	if (res2.w > 0.0 && res2.w < res.w || res.w <= 0.0)
+		res = res2;
+		
+	return res;
+}
+
+vec4 leaves(vec3 rayPos, vec3 rayDir)
+{
+	float t = 1e20;
+	vec3 n = vec3(0.0);
+	
+	rayPos -= leavesPos;
+	
+	float sway = impulse(15.0, fract(iGlobalTime / PI * 0.125));
+	float upDownSway = sway * -sin(iGlobalTime) * 0.06;
+	float openAmount = sway * max(-cos(iGlobalTime) * 0.4, 0.0);
+	
+	float angleOffset = -0.1;	
+	for (float k = 0.0; k < 6.2; k += 0.75)
+	{
+		// Left-right
+		float alpha = k + (k - PI) * sway * 0.015;
+		vec3 p = rotate(rayPos, alpha);
+		vec3 d = rotate(rayDir, alpha);
+		
+		// Up-down
+		angleOffset *= -1.0;
+		float theta = -0.4 + 
+			angleOffset + 
+			cos(k) * 0.35 + 
+			upDownSway + 
+			sin(iGlobalTime+k*10.0) * 0.03 * (sway + 0.2);
+		
+		p = rotate(p.xzy, theta).xzy;
+		d = rotate(d.xzy, theta).xzy;
+	
+		// Shift
+		p -= vec3(5.4, 0.0, 0.0);
+		
+		// Intersect individual leaf
+		vec4 res = intersectLeaf(p, d, 1.0+openAmount);
+		if (res.w > 0.0 && res.w < t)
+		{
+			t = res.w;
+			n = res.xyz;
+		}
+	}
+	
+	return vec4(n, t);
+}
+
+// Lighting
+float shadow(vec3 rayPos, vec3 rayDir)
+{	
+	float s = 1.0;
+	
+	// Intersect sand
+	//vec4 resSand = intersectSand(rayPos, rayDir);
+	//if (resSand.w > 0.0) return 0.0;
+	
+	// Intersect plants
+	s = min(s, plantsShadow(rayPos, rayDir));
+	if (s < 0.0001) return 0.0;
+	
+	// Intersect leaves
+	vec4 resLeaves = leaves(rayPos, rayDir);
+	if (resLeaves.w > 0.0 && resLeaves.w < 1e7) return 0.0;
+	
+	return s;
+}
+
+vec3 light(vec3 p, vec3 n)
+{
+	float s = 1.0;
+	
+	#ifdef SHADOWS
+	s = shadow(p-sunDir*0.01, -sunDir);
+	#endif
+	
+	vec3 col = sunCol * min(max(dot(n, sunDir), 0.0), s);
+	col += skyCol * (-n.y * 0.5 + 0.5) * 0.3;
+	return col;
+}
+
+vec3 lightLeaves(vec3 p, vec3 n)
+{
+	float s = 1.0;
+	
+	#ifdef SHADOWS
+	s = shadow(p-sunDir*0.01, -sunDir);
+	#endif
+	
+	float ao = min(length(p - leavesPos) * 0.1, 1.0);
+	
+	float ns = dot(n, sunDir);
+	float d = sqrt(max(ns, 0.0));
+	vec3 col = sunCol * min(d, s);
+	col += sunCol * max(-ns, 0.0) * vec3(0.3, 0.3, 0.1) * ao;
+	col += skyCol * (-n.y * 0.5 + 0.5) * 0.3 * ao;
+	return col;
+}
+
+vec3 sky(vec3 n)
+{
+	return skyCol * (1.0 - n.y * 0.8);
+}
+
+// Ray-marching
+vec4 plants(vec3 rayPos, vec3 rayDir)
+{
+	float t = 0.0;
+	
+	for (int i = 0; i < 40; i++)
+	{
+		vec3 pos = rayPos+rayDir*t;	
+		vec2 res = scene(pos);
+		float h = res.x;
+		
+		if (h < 0.001)
+		{
+			vec3 col = res.y == 2.0 ? treeCol : grassCol;
+			float uvFact = res.y == 2.0 ? 1.0 : 10.0;
+			
+			vec3 n = normal(pos);
+			vec2 uv = vec2(n.x, pos.y * 0.5) * 0.2 * uvFact;
+			vec3 tex = texture2D(iChannel0, uv).rgb * 0.6 + 0.4;
+			float ao = min(length(pos - leavesPos) * 0.1, 1.0);
+			return vec4(col * light(pos, n) * ao * tex, t);
+		}
+		
+		t += h;
+	}
+	
+	return vec4(sky(rayDir), 1e8);
+}
+
+// Final combination
+vec3 traceReflection(vec3 rayPos, vec3 rayDir)
+{
+	vec3 col = vec3(0.0);
+	float t = 1e20;
+			
+	// Intersect plants
+	vec4 resPlants = plants(rayPos, rayDir);
+	if (resPlants.w > 0.0 && resPlants.w < t)
+	{
+		t = resPlants.w;
+		col = resPlants.xyz;
+	}
+	
+	// Intersect leaves
+	vec4 resLeaves = leaves(rayPos, rayDir);
+	if (resLeaves.w > 0.0 && resLeaves.w < t)
+	{
+		vec3 pos = rayPos + rayDir * resLeaves.w;
+		vec2 uv = (pos.xz - leavesPos.xz) * 0.3;
+		float tex = texture2D(iChannel0, uv).r * 0.6 + 0.5;
+		
+		t = resLeaves.w;
+		col = leavesCol * lightLeaves(pos, resLeaves.xyz) * tex;
+	}
+		
+	if (t > 1e7) return sky(rayDir);
+	
+	return col;
+}
+
+vec3 trace(vec3 rayPos, vec3 rayDir)
+{
+	vec3 col = vec3(0.0);
+	float t = 1e20;
+	
+	// Intersect sand
+	vec4 resSand = intersectSand(rayPos, rayDir);
+	if (resSand.w > 0.0)
+	{
+		vec3 pos = rayPos + rayDir * resSand.w;
+		t = resSand.w;
+
+		col = sandCol * light(pos, resSand.xyz);
+	}
+	
+	// Intersect treasure chest
+	vec4 resTreasure = intersectTreasure(rayPos, rayDir);
+	if (resTreasure.w > 0.0 && resTreasure.w < t)
+	{
+		vec3 pos = rayPos + rayDir * resTreasure.w;
+		t = resTreasure.w;
+		col = leavesCol * light(pos, resTreasure.xyz);
+	}
+	
+	// Intersect leaves
+	vec4 resLeaves = leaves(rayPos, rayDir);
+	if (resLeaves.w > 0.0 && resLeaves.w < t)
+	{
+		vec3 pos = rayPos + rayDir * resLeaves.w;
+		vec2 uv = (pos.xz - leavesPos.xz) * 0.3;
+		float tex = texture2D(iChannel0, uv).r * 0.6 + 0.5;
+		
+		t = resLeaves.w;
+		col = leavesCol * lightLeaves(pos, resLeaves.xyz) * tex;
+	}
+	
+	// Intersect plants
+	vec4 resPlants = plants(rayPos, rayDir);
+	if (resPlants.w > 0.0 && resPlants.w < t)
+	{
+		t = resPlants.w;
+		col = resPlants.xyz;
+	}
+		
+	// Intersect water	
+	vec4 resWater = intersectWater(rayPos, rayDir);
+	if (resWater.w > 0.0 && resWater.w < t)
+	{
+		vec3 pos = rayPos + rayDir * resWater.w;
+		float dist = t - resWater.w;
+		vec3 n = bump(pos, rayDir);
+		
+		float ct = -min(dot(n,rayDir), 0.0);
+		float fresnel = 0.9 - 0.9 * pow(1.0 - ct, 5.0);
+		
+		vec3 trans = col * exp(-dist * vec3(1.0, 0.7, 0.4) * 3.0);
+		vec3 reflDir = normalize(reflect(rayDir, n));
+		vec3 refl = sky(reflDir);
+		
+		#ifdef REFLECTIONS
+		if (dot(pos, rayDir) < -2.0)
+			refl = traceReflection(pos, reflDir).rgb;
+		#endif
+				
+		t = resWater.t;
+		col = mix(refl, trans, fresnel);
+	}
+	
+	if (t > 1e7) return sky(rayDir);
+	
+	return col;
+}
+
+// Ray-generation
+vec3 camera(vec2 px)
+{
+	vec2 rd = (px / iResolution.yy - vec2(iResolution.x/iResolution.y*0.5-0.5, 0.0)) * 2.0 - 1.0;
+	float t = sin(iGlobalTime * 0.1) * 0.2;
+	vec3 rayDir = normalize(vec3(rd.x, rd.y, 1.0));
+	vec3 rayPos = vec3(0.0, 3.0, -18.0);
+	return trace(rayPos, rayDir);
+}
+
+void main(void)
+{
+	#ifdef HEAVY_AA
+		vec3 col = camera(gl_FragCoord.xy+vec2(0.0,0.5))*0.25;
+		col += camera(gl_FragCoord.xy+vec2(0.25,0.0))*0.25;
+		col += camera(gl_FragCoord.xy+vec2(0.5,0.75))*0.25;
+		col += camera(gl_FragCoord.xy+vec2(0.75,0.25))*0.25;
+	#else
+		vec3 col = camera(gl_FragCoord.xy);
+		#ifdef LIGHT_AA
+			col = col * 0.5 + camera(gl_FragCoord.xy+vec2(0.5,0.5))*0.5;
+		#endif
+	#endif
+	
+	#ifdef TONEMAP
+	// Optimized Haarm-Peter Duiker’s curve
+	vec3 x = max(vec3(0.0),col*exposure-0.004);
+	col = (x*(6.2*x+.5))/(x*(6.2*x+1.7)+0.06);
+	#else
+	col = pow(col, vec3(0.4545));
+	#endif
+	
+	gl_FragColor = vec4(col, 1.0);
+}
--- a/samples/HLSL/bloom.cginc
+++ b/samples/HLSL/bloom.cginc
@@ -0,0 +1,89 @@
+// From https://github.com/Unity-Technologies/PostProcessing/blob/master/PostProcessing/Resources/Shaders/Bloom.cginc
+// Licensed under the MIT license
+
+#ifndef __BLOOM__
+#define __BLOOM__
+
+#include "Common.cginc"
+
+// Brightness function
+half Brightness(half3 c)
+{
+    return Max3(c);
+}
+
+// 3-tap median filter
+half3 Median(half3 a, half3 b, half3 c)
+{
+    return a + b + c - min(min(a, b), c) - max(max(a, b), c);
+}
+
+// Downsample with a 4x4 box filter
+half3 DownsampleFilter(sampler2D tex, float2 uv, float2 texelSize)
+{
+    float4 d = texelSize.xyxy * float4(-1.0, -1.0, 1.0, 1.0);
+
+    half3 s;
+    s = DecodeHDR(tex2D(tex, uv + d.xy));
+    s += DecodeHDR(tex2D(tex, uv + d.zy));
+    s += DecodeHDR(tex2D(tex, uv + d.xw));
+    s += DecodeHDR(tex2D(tex, uv + d.zw));
+
+    return s * (1.0 / 4.0);
+}
+
+// Downsample with a 4x4 box filter + anti-flicker filter
+half3 DownsampleAntiFlickerFilter(sampler2D tex, float2 uv, float2 texelSize)
+{
+    float4 d = texelSize.xyxy * float4(-1.0, -1.0, 1.0, 1.0);
+
+    half3 s1 = DecodeHDR(tex2D(tex, uv + d.xy));
+    half3 s2 = DecodeHDR(tex2D(tex, uv + d.zy));
+    half3 s3 = DecodeHDR(tex2D(tex, uv + d.xw));
+    half3 s4 = DecodeHDR(tex2D(tex, uv + d.zw));
+
+    // Karis's luma weighted average (using brightness instead of luma)
+    half s1w = 1.0 / (Brightness(s1) + 1.0);
+    half s2w = 1.0 / (Brightness(s2) + 1.0);
+    half s3w = 1.0 / (Brightness(s3) + 1.0);
+    half s4w = 1.0 / (Brightness(s4) + 1.0);
+    half one_div_wsum = 1.0 / (s1w + s2w + s3w + s4w);
+
+    return (s1 * s1w + s2 * s2w + s3 * s3w + s4 * s4w) * one_div_wsum;
+}
+
+half3 UpsampleFilter(sampler2D tex, float2 uv, float2 texelSize, float sampleScale)
+{
+#if MOBILE_OR_CONSOLE
+    // 4-tap bilinear upsampler
+    float4 d = texelSize.xyxy * float4(-1.0, -1.0, 1.0, 1.0) * (sampleScale * 0.5);
+
+    half3 s;
+    s =  DecodeHDR(tex2D(tex, uv + d.xy));
+    s += DecodeHDR(tex2D(tex, uv + d.zy));
+    s += DecodeHDR(tex2D(tex, uv + d.xw));
+    s += DecodeHDR(tex2D(tex, uv + d.zw));
+
+    return s * (1.0 / 4.0);
+#else
+    // 9-tap bilinear upsampler (tent filter)
+    float4 d = texelSize.xyxy * float4(1.0, 1.0, -1.0, 0.0) * sampleScale;
+
+    half3 s;
+    s =  DecodeHDR(tex2D(tex, uv - d.xy));
+    s += DecodeHDR(tex2D(tex, uv - d.wy)) * 2.0;
+    s += DecodeHDR(tex2D(tex, uv - d.zy));
+
+    s += DecodeHDR(tex2D(tex, uv + d.zw)) * 2.0;
+    s += DecodeHDR(tex2D(tex, uv))        * 4.0;
+    s += DecodeHDR(tex2D(tex, uv + d.xw)) * 2.0;
+
+    s += DecodeHDR(tex2D(tex, uv + d.zy));
+    s += DecodeHDR(tex2D(tex, uv + d.wy)) * 2.0;
+    s += DecodeHDR(tex2D(tex, uv + d.xy));
+
+    return s * (1.0 / 16.0);
+#endif
+}
+
+#endif // __BLOOM__
--- a/samples/Jolie/common.iol
+++ b/samples/Jolie/common.iol
@@ -0,0 +1,37 @@
+include "types/Binding.iol"
+
+constants {
+	Location_Exam = "socket://localhost:8000"
+}
+
+type StartExamRequest:void {
+	.examName:string
+	.studentName:string
+	.student:Binding
+}
+
+type MakeQuestionRequest:void {
+	.question:string
+	.examName:string
+	.studentName:string
+}
+
+type DecisionMessage:void {
+	.studentName:string
+	.examName:string
+}
+
+interface ExamInterface {
+OneWay:
+	startExam(StartExamRequest),
+	pass(DecisionMessage), fail(DecisionMessage)
+RequestResponse:
+	makeQuestion(MakeQuestionRequest)(int)
+}
+
+interface StudentInterface {
+OneWay:
+	sendMessage(string)
+RequestResponse:
+	makeQuestion(MakeQuestionRequest)(int)
+}
--- a/samples/Jolie/exam.ol
+++ b/samples/Jolie/exam.ol
@@ -0,0 +1,39 @@
+include "common.iol"
+
+cset {
+studentName:
+	StartExamRequest.studentName
+	DecisionMessage.studentName
+	MakeQuestionRequest.studentName,
+examName:
+	StartExamRequest.examName
+	DecisionMessage.examName
+	MakeQuestionRequest.examName
+}
+
+execution { concurrent }
+
+outputPort Student {
+Interfaces: StudentInterface
+}
+
+inputPort ExamInput {
+Location: Location_Exam
+Protocol: sodep
+Interfaces: ExamInterface
+}
+
+main
+{
+	startExam( examRequest );
+	Student << examRequest.student;
+	makeQuestion( question )( answer ) {
+		makeQuestion@Student( question )( answer )
+	};
+	[ pass( message ) ] {
+		sendMessage@Student( "You passed!" )
+	}
+	[ fail( message ) ] {
+		sendMessage@Student( "You failed!" )
+	}
+}
--- a/samples/Jolie/examiner.ol
+++ b/samples/Jolie/examiner.ol
@@ -0,0 +1,26 @@
+include "common.iol"
+include "ui/swing_ui.iol"
+include "console.iol"
+
+outputPort Exam {
+Location: Location_Exam
+Protocol: sodep
+Interfaces: ExamInterface
+}
+
+main
+{
+	question.studentName = "John";
+	question.examName = "SPLG";
+	question.question = "Random question";
+	makeQuestion@Exam( question )( answer );
+	showYesNoQuestionDialog@SwingUI( "Do you want to accept answer " + answer + " ?" )( decision );
+
+	message.studentName = "John";
+	message.examName = "SPLG";
+	if ( decision == 0 ) {
+		pass@Exam( message )
+	} else {
+		fail@Exam( message )
+	}
+}
--- a/samples/Jolie/hanoi.ol
+++ b/samples/Jolie/hanoi.ol
@@ -0,0 +1,84 @@
+// https://github.com/jolie/website/blob/master/docs/documentation/locations/code/local.ol
+
+include "runtime.iol"
+include "string_utils.iol"
+
+type HanoiRequest: void{
+  .src: string
+  .aux: string
+  .dst: string
+  .n: int
+  .sid?: string
+}
+
+type HanoiReponse: void {
+  .move?: string
+}
+
+interface LocalOperations{
+  RequestResponse:
+    hanoiSolver( HanoiRequest )( HanoiReponse )
+}
+
+interface ExternalOperations{
+  RequestResponse:
+    hanoi( HanoiRequest )( string )
+}
+
+outputPort Self{
+  Interfaces: LocalOperations
+}
+
+inputPort Self {
+  Location: "local"
+  Interfaces: LocalOperations
+}
+
+inputPort PowerService {
+  Location: "socket://localhost:8000"
+  Protocol: http{
+    .format = "html"
+  }
+  Interfaces: ExternalOperations
+}
+
+execution { concurrent }
+
+init
+{
+  getLocalLocation@Runtime()( Self.location )
+}
+
+main
+{
+  [ hanoi( request )( response ){
+    getRandomUUID@StringUtils()(request.sid);
+    hanoiSolver@Self( request )( subRes );
+    response = subRes.move
+  }]{ nullProcess }
+
+  [ hanoiSolver( request )( response ){
+    if ( request.n > 0 ){
+      subReq.n = request.n;
+      subReq.n--;
+      with( request ){
+        subReq.aux = .dst;
+        subReq.dst = .aux;
+        subReq.src = .src;
+        subReq.sid = .sid
+      };
+      hanoiSolver@Self( subReq )( response );
+      response.move +=  "<br>" + 
+                ++global.counters.(request.sid) + 
+                ") Move from " + request.src +
+                " to " + request.dst + ";";
+      with ( request ){
+        subReq.src = .aux;
+        subReq.aux = .src;
+        subReq.dst = .dst
+      };
+      hanoiSolver@Self( subReq )( subRes );
+      response.move += subRes.move
+    }
+  }]{ nullProcess }
+}
--- a/samples/Jolie/student.ol
+++ b/samples/Jolie/student.ol
@@ -0,0 +1,29 @@
+include "common.iol"
+include "ui/swing_ui.iol"
+include "console.iol"
+
+outputPort Exam {
+Location: Location_Exam
+Protocol: sodep
+Interfaces: ExamInterface
+}
+
+inputPort StudentInput {
+Location: "socket://localhost:8001/"
+Protocol: sodep
+Interfaces: StudentInterface
+}
+
+main
+{
+	request.studentName = "John";
+	request.examName = "SPLG";
+	request.student.location = "socket://localhost:8001/";
+	request.student.protocol = "sodep";
+	startExam@Exam( request );
+	makeQuestion( question )( answer ) {
+		showYesNoQuestionDialog@SwingUI( question.question )( answer )
+	};
+	sendMessage( message );
+	println@Console( message )()
+}
--- a/samples/Markdown/README.mdown
+++ b/samples/Markdown/README.mdown
@@ -0,0 +1,20 @@
+# Installation
+
+You can install this bundle in TextMate by opening the preferences and going to the bundles tab. After installation it will be automatically updated for you.
+
+# General
+
+* [Bundle Styleguide](http://kb.textmate.org/bundle_styleguide) — _before you make changes_
+* [Commit Styleguide](http://kb.textmate.org/commit_styleguide) — _before you send a pull request_
+* [Writing Bug Reports](http://kb.textmate.org/writing_bug_reports) — _before you report an issue_
+
+# License
+
+If not otherwise specified (see below), files in this repository fall under the following license:
+
+	Permission to copy, use, modify, sell and distribute this
+	software is granted. This software is provided "as is" without
+	express or implied warranty, and with no claim as to its
+	suitability for any purpose.
+
+An exception is made for files in readable text which contain their own license information, or files where an accompanying file exists (in the same directory) with a “-license” suffix added to the base-name name of the original file, and an extension of txt, html, or similar. For example “tidy” is accompanied by “tidy-license.txt”.
--- a/samples/Markdown/csharp6.workbook
+++ b/samples/Markdown/csharp6.workbook
@@ -0,0 +1,192 @@
+---
+uti: com.xamarin.workbook
+platforms:
+- Console
+---
+
+# Using C# 6
+
+Some examples from Xamarin's [intro to C# 6](https://developer.xamarin.com/guides/cross-platform/advanced/csharp_six/).
+
+* Null-conditional operator
+
+* String Interpolation
+
+* Expression-bodied Function Members
+
+* Auto-property Initialization
+
+* Index Initializers
+
+* using static
+
+## Null-conditional operator
+
+The `?.` operator automatically does a null-check before referencing the
+specified member. The example string array below has a `null` entry:
+
+```csharp
+var names = new string[] { "Foo", null };
+```
+
+In C# 5, a null-check is required before accessing the `.Length` property:
+
+```csharp
+// C# 5
+int secondLength = 0;
+if (names[1] != null)
+  secondLength = names[1].Length;
+```
+
+C# 6 allows the length to be queried in a single line; the entire
+statement returns `null` if any object is null.
+
+```csharp
+var length0 = names[0]?.Length; // 3
+var length1 = names[1]?.Length; // null
+```
+
+This can be used in conjunction with the `??` null coalescing operator
+to set a default value (such as `0`) in the example below:
+
+```csharp
+var lengths = names.Select (names => names?.Length ?? 0); //[3, 0]
+```
+
+## String Interpolation
+
+Previously strings were built in a number of different ways:
+
+```csharp
+var animal = "Monkeys";
+var food = "bananas";
+
+var out1 = String.Format ("{0} love to eat {1}", animal, food);
+var out2 = animal + " love to eat " + food;
+// or even StringBuilder
+```
+
+C# 6 provides a simple syntax where the fieldname can be
+embedded directly in the string:
+
+```csharp
+$"{animal} love to eat {food}"
+```
+
+String-formatting can also be done with this syntax:
+
+```csharp
+var values = new int[] { 1, 2, 3, 4, 12, 123456 };
+foreach (var s in values.Select (i => $"The value is {i,10:N2}.")) {
+   Console.WriteLine (s);
+}
+```
+
+## Expression-bodied Function Members
+
+The `ToString` override in the following class is an expression-bodied
+function - a more succinct declaration syntax.
+
+```csharp
+class Person
+{
+    public string FirstName { get; }
+    public string LastName { get; }
+    public Person (string firstname, string lastname)
+    {
+       FirstName = firstname;
+       LastName = lastname;
+    }
+    // note there is no explicit `return` keyword
+    public override string ToString () => $"{LastName}, {FirstName} {LastName}";
+}
+```
+
+`void` expression bodied functions are also allowed so long as
+the expression is a statement:
+
+```csharp
+public void Log(string message) => System.Console.WriteLine($"{DateTime.Now.ToString ("s", System.Globalization.CultureInfo.InvariantCulture )}: {message}");
+```
+
+This simple example calls these two methods:
+
+```csharp
+Log(new Person("James", "Bond").ToString())
+```
+
+## Auto-property Initialization
+
+Properties (ie. specified with `{get;set;}`) can be initialized inline
+with C# 6:
+
+```csharp
+class Todo
+{
+    public bool Done { get; set; } = false;
+    public DateTime Created { get; } = DateTime.Now;
+    public string Description { get; }
+
+    public Todo (string description)
+    {
+       this.Description = description; // can assign (only in constructor!)
+    }
+    public override string ToString () => $"'{Description}' was created on {Created}";
+}
+```
+
+```csharp
+new Todo("buy apples")
+```
+
+## Index Initializers
+
+Dictionary-style data structures let you specify key/value
+types with a simple object-initializer-like syntax:
+
+```csharp
+var userInfo = new Dictionary<string,object> {
+    ["Created"] = DateTime.Now,
+    ["Due"] = DateTime.Now.AddSeconds(60 * 60 * 24),
+    ["Task"] = "buy lettuce"
+};
+```
+
+## using static
+
+Enumerations, and certain classes such as System.Math, are primarily
+holders of static values and functions. In C# 6, you can import all
+static members of a type with a single using static statement:
+
+```csharp
+using static System.Math;
+```
+
+C# 6 code can then reference the static members directly, avoiding
+repetition of the class name (eg. `Math.PI` becomes `PI`):
+
+```csharp
+public class Location 
+{
+    public Location (double lat, double @long) {Latitude = lat; Longitude = @long;} 
+    public double Latitude = 0; public double Longitude = 0; 
+}
+static public double MilesBetween(Location loc1, Location loc2)
+{
+  double rlat1  = PI * loc1.Latitude / 180;
+  double rlat2  = PI * loc2.Latitude / 180;
+  double theta  = loc1.Longitude - loc2.Longitude;
+  double rtheta = PI * theta / 180;
+  double dist =
+      Sin(rlat1) * Sin(rlat2) + Cos(rlat1) *
+      Cos(rlat2) * Cos(rtheta);
+  dist = Acos(dist);
+  dist = dist*180/PI;
+  dist = dist*60*1.1515;
+  return dist; //miles
+}
+```
+
+```csharp
+MilesBetween (new Location(-12,22), new Location(-13,33))
+```
--- a/samples/PLSQL/print_bool.prc
+++ b/samples/PLSQL/print_bool.prc
@@ -0,0 +1,12 @@
+create or replace procedure print_bool(
+    p_bool in BOOLEAN,
+    p_true_value in varchar2 default 'TRUE',
+    p_false_value in varchar2 := 'FALSE'
+)
+as
+begin
+
+    dbms_output.put_line(case when p_bool then p_true_value else p_false_value end);
+
+end print_bool;
+/
--- a/samples/PLSQL/videodb.ddl
+++ b/samples/PLSQL/videodb.ddl
@@ -0,0 +1,48 @@
+CREATE TABLE users (
+   user_name varchar2(40),
+   first_name varchar2(40),
+   last_name varchar2(40),
+   email varchar2(40),
+   password varchar2(40),
+   created_date DATE,
+   total_credits NUMBER,
+   credit_change_date DATE,
+   PRIMARY KEY (user_name)
+);
+/
+
+CREATE TABLE users_videos (
+   video_id NUMBER,
+   video_name varchar2(40),
+   user_name varchar2(40),
+   description varchar2(512),
+   upload_date DATE,
+   PRIMARY KEY (video_id),
+   CONSTRAINT "USERS_VIDEOS_FK1" FOREIGN KEY ("USER_NAME") REFERENCES "USERS"("USER_NAME")
+);
+/
+
+create or replace procedure print_user_videos(
+    p_user_name in users.user_name%type
+)
+AUTHID DEFINER
+as
+    type t_user_videos is table of users_videos%rowtype
+        index by pls_integer;
+    l_videos t_user_videos;
+begin
+
+    select *
+    bulk collect into l_videos
+    from users_videos
+    where user_name = p_user_name;
+
+    for i in 1..l_videos.COUNT
+    loop
+
+        dbms_output.put_line(l_videos(i).video_name);
+
+    end loop;
+
+end print_user_videos;
+/
--- a/samples/Python/argparse.pyi
+++ b/samples/Python/argparse.pyi
@@ -0,0 +1,159 @@
+# Stubs for argparse (Python 3.4)
+
+from typing import (
+    Any, Callable, Iterable, List, IO, Optional, Sequence, Tuple, Type, Union,
+    TypeVar, overload
+)
+import sys
+
+_T = TypeVar('_T')
+
+if sys.version_info >= (3,):
+    _Text = str
+else:
+    _Text = Union[str, unicode]
+
+ONE_OR_MORE = ...  # type: str
+OPTIONAL = ...  # type: str
+PARSER = ...  # type: str
+REMAINDER = ...  # type: str
+SUPPRESS = ...  # type: str
+ZERO_OR_MORE = ...  # type: str
+
+class ArgumentError(Exception): ...
+
+class ArgumentParser:
+    if sys.version_info >= (3, 5):
+        def __init__(self,
+                     prog: Optional[str] = ...,
+                     usage: Optional[str] = ...,
+                     description: Optional[str] = ...,
+                     epilog: Optional[str] = ...,
+                     parents: Sequence[ArgumentParser] = ...,
+                     formatter_class: Type[HelpFormatter] = ...,
+                     prefix_chars: _Text = ...,
+                     fromfile_prefix_chars: Optional[str] = ...,
+                     argument_default: Optional[str] = ...,
+                     conflict_handler: _Text = ...,
+                     add_help: bool = ...,
+                     allow_abbrev: bool = ...) -> None: ...
+    else:
+        def __init__(self,
+                     prog: Optional[_Text] = ...,
+                     usage: Optional[_Text] = ...,
+                     description: Optional[_Text] = ...,
+                     epilog: Optional[_Text] = ...,
+                     parents: Sequence[ArgumentParser] = ...,
+                     formatter_class: Type[HelpFormatter] = ...,
+                     prefix_chars: _Text = ...,
+                     fromfile_prefix_chars: Optional[_Text] = ...,
+                     argument_default: Optional[_Text] = ...,
+                     conflict_handler: _Text = ...,
+                     add_help: bool = ...) -> None: ...
+    def add_argument(self,
+                     *name_or_flags: Union[_Text, Sequence[_Text]],
+                     action: Union[_Text, Type[Action]] = ...,
+                     nargs: Union[int, _Text] = ...,
+                     const: Any = ...,
+                     default: Any = ...,
+                     type: Union[Callable[[str], _T], FileType] = ...,
+                     choices: Iterable[_T] = ...,
+                     required: bool = ...,
+                     help: _Text = ...,
+                     metavar: Union[_Text, Tuple[_Text, ...]] = ...,
+                     dest: _Text = ...,
+                     version: _Text = ...) -> None: ...  # weirdly documented
+    def parse_args(self, args: Optional[Sequence[_Text]] = ...,
+                   namespace: Optional[Namespace] = ...) -> Namespace: ...
+    def add_subparsers(self, title: _Text = ...,
+                       description: Optional[_Text] = ...,
+                       prog: _Text = ...,
+                       parser_class: Type[ArgumentParser] = ...,
+                       action: Type[Action] = ...,
+                       option_string: _Text = ...,
+                       dest: Optional[_Text] = ...,
+                       help: Optional[_Text] = ...,
+                       metavar: Optional[_Text] = ...) -> _SubParsersAction: ...
+    def add_argument_group(self, title: Optional[_Text] = ...,
+                           description: Optional[_Text] = ...) -> _ArgumentGroup: ...
+    def add_mutually_exclusive_group(self, required: bool = ...) -> _MutuallyExclusiveGroup: ...
+    def set_defaults(self, **kwargs: Any) -> None: ...
+    def get_default(self, dest: _Text) -> Any: ...
+    def print_usage(self, file: Optional[IO[str]] = ...) -> None: ...
+    def print_help(self, file: Optional[IO[str]] = ...) -> None: ...
+    def format_usage(self) -> str: ...
+    def format_help(self) -> str: ...
+    def parse_known_args(self, args: Optional[Sequence[_Text]] = ...,
+                         namespace: Optional[Namespace] = ...) -> Tuple[Namespace, List[str]]: ...
+    def convert_arg_line_to_args(self, arg_line: _Text) -> List[str]: ...
+    def exit(self, status: int = ..., message: Optional[_Text] = ...) -> None: ...
+    def error(self, message: _Text) -> None: ...
+
+class HelpFormatter:
+    # not documented
+    def __init__(self, prog: _Text, indent_increment: int = ...,
+                 max_help_position: int = ...,
+                 width: Optional[int] = ...) -> None: ...
+class RawDescriptionHelpFormatter(HelpFormatter): ...
+class RawTextHelpFormatter(HelpFormatter): ...
+class ArgumentDefaultsHelpFormatter(HelpFormatter): ...
+if sys.version_info >= (3,):
+    class MetavarTypeHelpFormatter(HelpFormatter): ...
+
+class Action:
+    def __init__(self,
+                 option_strings: Sequence[_Text],
+                 dest: _Text = ...,
+                 nargs: Optional[Union[int, _Text]] = ...,
+                 const: Any = ...,
+                 default: Any = ...,
+                 type: Union[Callable[[str], _T], FileType, None] = ...,
+                 choices: Optional[Iterable[_T]] = ...,
+                 required: bool = ...,
+                 help: Optional[_Text] = ...,
+                 metavar: Union[_Text, Tuple[_Text, ...]] = ...) -> None: ...
+    def __call__(self, parser: ArgumentParser, namespace: Namespace,
+                 values: Union[_Text, Sequence[Any], None],
+                 option_string: _Text = ...) -> None: ...
+
+class Namespace:
+    def __getattr__(self, name: _Text) -> Any: ...
+    def __setattr__(self, name: _Text, value: Any) -> None: ...
+
+class FileType:
+    if sys.version_info >= (3, 4):
+        def __init__(self, mode: _Text = ..., bufsize: int = ...,
+                     encoding: Optional[_Text] = ...,
+                     errors: Optional[_Text] = ...) -> None: ...
+    elif sys.version_info >= (3,):
+        def __init__(self,
+                     mode: _Text = ..., bufsize: int = ...) -> None: ...
+    else:
+        def __init__(self,
+                     mode: _Text = ..., bufsize: Optional[int] = ...) -> None: ...
+    def __call__(self, string: _Text) -> IO[Any]: ...
+
+class _ArgumentGroup:
+    def add_argument(self,
+                     *name_or_flags: Union[_Text, Sequence[_Text]],
+                     action: Union[_Text, Type[Action]] = ...,
+                     nargs: Union[int, _Text] = ...,
+                     const: Any = ...,
+                     default: Any = ...,
+                     type: Union[Callable[[str], _T], FileType] = ...,
+                     choices: Iterable[_T] = ...,
+                     required: bool = ...,
+                     help: _Text = ...,
+                     metavar: Union[_Text, Tuple[_Text, ...]] = ...,
+                     dest: _Text = ...,
+                     version: _Text = ...) -> None: ...
+    def add_mutually_exclusive_group(self, required: bool = ...) -> _MutuallyExclusiveGroup: ...
+
+class _MutuallyExclusiveGroup(_ArgumentGroup): ...
+
+class _SubParsersAction:
+    # TODO: Type keyword args properly.
+    def add_parser(self, name: _Text, **kwargs: Any) -> ArgumentParser: ...
+
+# not documented
+class ArgumentTypeError(Exception): ...
--- a/samples/Ruby/filenames/.irbrc
+++ b/samples/Ruby/filenames/.irbrc
@@ -0,0 +1,2 @@
+require "pp"
+IRB.conf[:AUTO_INDENT] = true
--- a/samples/ShaderLab/DepthOfField.shader
+++ b/samples/ShaderLab/DepthOfField.shader
@@ -0,0 +1,95 @@
+// From https://github.com/Unity-Technologies/PostProcessing,
+// licensed under MIT licence.
+
+Shader "Hidden/Post FX/Depth Of Field"
+{
+    Properties
+    {
+        _MainTex ("", 2D) = "black"
+    }
+
+    CGINCLUDE
+        #pragma exclude_renderers d3d11_9x
+        #pragma target 3.0
+    ENDCG
+
+    SubShader
+    {
+        Cull Off ZWrite Off ZTest Always
+
+        // (0) Downsampling, prefiltering & CoC
+        Pass
+        {
+            CGPROGRAM
+                #pragma multi_compile __ UNITY_COLORSPACE_GAMMA
+                #pragma vertex VertDOF
+                #pragma fragment FragPrefilter
+                #include "DepthOfField.cginc"
+            ENDCG
+        }
+
+        // (1) Pass 0 + temporal antialiasing
+        Pass
+        {
+            CGPROGRAM
+                #pragma vertex VertDOF
+                #pragma fragment FragPrefilter
+                #define PREFILTER_TAA
+                #include "DepthOfField.cginc"
+            ENDCG
+        }
+
+        // (2-5) Bokeh filter with disk-shaped kernels
+        Pass
+        {
+            CGPROGRAM
+                #pragma vertex VertDOF
+                #pragma fragment FragBlur
+                #define KERNEL_SMALL
+                #include "DepthOfField.cginc"
+            ENDCG
+        }
+
+        Pass
+        {
+            CGPROGRAM
+                #pragma vertex VertDOF
+                #pragma fragment FragBlur
+                #define KERNEL_MEDIUM
+                #include "DepthOfField.cginc"
+            ENDCG
+        }
+
+        Pass
+        {
+            CGPROGRAM
+                #pragma vertex VertDOF
+                #pragma fragment FragBlur
+                #define KERNEL_LARGE
+                #include "DepthOfField.cginc"
+            ENDCG
+        }
+
+        Pass
+        {
+            CGPROGRAM
+                #pragma vertex VertDOF
+                #pragma fragment FragBlur
+                #define KERNEL_VERYLARGE
+                #include "DepthOfField.cginc"
+            ENDCG
+        }
+
+        // (6) Postfilter blur
+        Pass
+        {
+            CGPROGRAM
+                #pragma vertex VertDOF
+                #pragma fragment FragPostBlur
+                #include "DepthOfField.cginc"
+            ENDCG
+        }
+    }
+
+    FallBack Off
+}
--- a/samples/ShaderLab/Fog.shader
+++ b/samples/ShaderLab/Fog.shader
@@ -0,0 +1,112 @@
+// From https://github.com/Unity-Technologies/PostProcessing,
+// licensed under MIT licence.
+
+Shader "Hidden/Post FX/Fog"
+{
+    Properties
+    {
+        _MainTex("Main Texture", 2D) = "white" {}
+    }
+
+    CGINCLUDE
+
+        #pragma multi_compile __ FOG_LINEAR FOG_EXP FOG_EXP2
+        #include "UnityCG.cginc"
+        #include "Common.cginc"
+
+        #define SKYBOX_THREASHOLD_VALUE 0.9999
+
+        struct Varyings
+        {
+            float2 uv : TEXCOORD0;
+            float4 vertex : SV_POSITION;
+        };
+
+        Varyings VertFog(AttributesDefault v)
+        {
+            Varyings o;
+            o.vertex = UnityObjectToClipPos(v.vertex);
+            o.uv = UnityStereoScreenSpaceUVAdjust(v.texcoord, _MainTex_ST);
+            return o;
+        }
+
+        sampler2D _CameraDepthTexture;
+
+        half4 _FogColor;
+        float _Density;
+        float _Start;
+        float _End;
+
+        half ComputeFog(float z)
+        {
+            half fog = 0.0;
+        #if FOG_LINEAR
+            fog = (_End - z) / (_End - _Start);
+        #elif FOG_EXP
+            fog = exp2(-_Density * z);
+        #else // FOG_EXP2
+            fog = _Density * z;
+            fog = exp2(-fog * fog);
+        #endif
+            return saturate(fog);
+        }
+
+        float ComputeDistance(float depth)
+        {
+            float dist = depth * _ProjectionParams.z;
+            dist -= _ProjectionParams.y;
+            return dist;
+        }
+
+        half4 FragFog(Varyings i) : SV_Target
+        {
+            half4 color = tex2D(_MainTex, i.uv);
+
+            float depth = SAMPLE_DEPTH_TEXTURE(_CameraDepthTexture, i.uv);
+            depth = Linear01Depth(depth);
+            float dist = ComputeDistance(depth) - _Start;
+            half fog = 1.0 - ComputeFog(dist);
+
+            return lerp(color, _FogColor, fog);
+        }
+
+        half4 FragFogExcludeSkybox(Varyings i) : SV_Target
+        {
+            half4 color = tex2D(_MainTex, i.uv);
+
+            float depth = SAMPLE_DEPTH_TEXTURE(_CameraDepthTexture, i.uv);
+            depth = Linear01Depth(depth);
+            float skybox = depth < SKYBOX_THREASHOLD_VALUE;
+            float dist = ComputeDistance(depth) - _Start;
+            half fog = 1.0 - ComputeFog(dist);
+
+            return lerp(color, _FogColor, fog * skybox);
+        }
+
+    ENDCG
+
+    SubShader
+    {
+        Cull Off ZWrite Off ZTest Always
+
+        Pass
+        {
+            CGPROGRAM
+
+                #pragma vertex VertFog
+                #pragma fragment FragFog
+
+            ENDCG
+        }
+
+        Pass
+        {
+            CGPROGRAM
+
+                #pragma vertex VertFog
+                #pragma fragment FragFogExcludeSkybox
+
+            ENDCG
+        }
+    }
+}
--- a/samples/ShaderLab/Uber.shader
+++ b/samples/ShaderLab/Uber.shader
@@ -0,0 +1,337 @@
+// From https://github.com/Unity-Technologies/PostProcessing,
+// licensed under MIT licence.
+
+Shader "Hidden/Post FX/Uber Shader"
+{
+    Properties
+    {
+        _MainTex ("Texture", 2D) = "white" {}
+        _AutoExposure ("", 2D) = "" {}
+        _BloomTex ("", 2D) = "" {}
+        _Bloom_DirtTex ("", 2D) = "" {}
+        _GrainTex ("", 2D) = "" {}
+        _LogLut ("", 2D) = "" {}
+        _UserLut ("", 2D) = "" {}
+        _Vignette_Mask ("", 2D) = "" {}
+        _ChromaticAberration_Spectrum ("", 2D) = "" {}
+        _DitheringTex ("", 2D) = "" {}
+    }
+
+    CGINCLUDE
+
+        #pragma target 3.0
+
+        #pragma multi_compile __ UNITY_COLORSPACE_GAMMA
+        #pragma multi_compile __ EYE_ADAPTATION
+        #pragma multi_compile __ CHROMATIC_ABERRATION
+        #pragma multi_compile __ DEPTH_OF_FIELD DEPTH_OF_FIELD_COC_VIEW
+        #pragma multi_compile __ BLOOM
+        #pragma multi_compile __ BLOOM_LENS_DIRT
+        #pragma multi_compile __ COLOR_GRADING COLOR_GRADING_LOG_VIEW
+        #pragma multi_compile __ USER_LUT
+        #pragma multi_compile __ GRAIN
+        #pragma multi_compile __ VIGNETTE_CLASSIC VIGNETTE_ROUND VIGNETTE_MASKED
+        #pragma multi_compile __ DITHERING
+
+        #include "UnityCG.cginc"
+        #include "Bloom.cginc"
+        #include "ColorGrading.cginc"
+        #include "UberSecondPass.cginc"
+
+        // Auto exposure / eye adaptation
+        sampler2D _AutoExposure;
+
+        // Chromatic aberration
+        half _ChromaticAberration_Amount;
+        sampler2D _ChromaticAberration_Spectrum;
+
+        // Depth of field
+        sampler2D_float _CameraDepthTexture;
+        sampler2D _DepthOfFieldTex;
+        float4 _DepthOfFieldTex_TexelSize;
+        float2 _DepthOfFieldParams; // x: distance, y: f^2 / (N * (S1 - f) * film_width * 2)
+
+        // Bloom
+        sampler2D _BloomTex;
+        float4 _BloomTex_TexelSize;
+        half2 _Bloom_Settings; // x: sampleScale, y: bloom.intensity
+
+        sampler2D _Bloom_DirtTex;
+        half _Bloom_DirtIntensity;
+
+        // Color grading & tonemapping
+        sampler2D _LogLut;
+        half3 _LogLut_Params; // x: 1 / lut_width, y: 1 / lut_height, z: lut_height - 1
+        half _ExposureEV; // EV (exp2)
+
+        // User lut
+        sampler2D _UserLut;
+        half4 _UserLut_Params; // @see _LogLut_Params
+
+        // Vignette
+        half3 _Vignette_Color;
+        half2 _Vignette_Center; // UV space
+        half3 _Vignette_Settings; // x: intensity, y: smoothness, z: roundness
+        sampler2D _Vignette_Mask;
+        half _Vignette_Opacity; // [0;1]
+
+        struct VaryingsFlipped
+        {
+            float4 pos : SV_POSITION;
+            float2 uv : TEXCOORD0;
+            float2 uvSPR : TEXCOORD1; // Single Pass Stereo UVs
+            float2 uvFlipped : TEXCOORD2; // Flipped UVs (DX/MSAA/Forward)
+            float2 uvFlippedSPR : TEXCOORD3; // Single Pass Stereo flipped UVs
+        };
+
+        VaryingsFlipped VertUber(AttributesDefault v)
+        {
+            VaryingsFlipped o;
+            o.pos = UnityObjectToClipPos(v.vertex);
+            o.uv = v.texcoord.xy;
+            o.uvSPR = UnityStereoScreenSpaceUVAdjust(v.texcoord.xy, _MainTex_ST);
+            o.uvFlipped = v.texcoord.xy;
+
+        #if UNITY_UV_STARTS_AT_TOP
+            if (_MainTex_TexelSize.y < 0.0)
+                o.uvFlipped.y = 1.0 - o.uvFlipped.y;
+        #endif
+
+            o.uvFlippedSPR = UnityStereoScreenSpaceUVAdjust(o.uvFlipped, _MainTex_ST);
+
+            return o;
+        }
+
+        half4 FragUber(VaryingsFlipped i) : SV_Target
+        {
+            float2 uv = i.uv;
+            half autoExposure = 1.0;
+
+            // Store the auto exposure value for later
+            #if EYE_ADAPTATION
+            {
+                autoExposure = tex2D(_AutoExposure, uv).r;
+            }
+            #endif
+
+            half3 color = (0.0).xxx;
+            #if DEPTH_OF_FIELD && CHROMATIC_ABERRATION
+            half4 dof = (0.0).xxxx;
+            #endif
+
+            //
+            // HDR effects
+            // ---------------------------------------------------------
+
+            // Chromatic Aberration
+            // Inspired by the method described in "Rendering Inside" [Playdead 2016]
+            // https://twitter.com/pixelmager/status/717019757766123520
+            #if CHROMATIC_ABERRATION
+            {
+                float2 coords = 2.0 * uv - 1.0;
+                float2 end = uv - coords * dot(coords, coords) * _ChromaticAberration_Amount;
+
+                float2 diff = end - uv;
+                int samples = clamp(int(length(_MainTex_TexelSize.zw * diff / 2.0)), 3, 16);
+                float2 delta = diff / samples;
+                float2 pos = uv;
+                half3 sum = (0.0).xxx, filterSum = (0.0).xxx;
+
+                #if DEPTH_OF_FIELD
+                float2 dofDelta = delta;
+                float2 dofPos = pos;
+                if (_MainTex_TexelSize.y < 0.0)
+                {
+                    dofDelta.y = -dofDelta.y;
+                    dofPos.y = 1.0 - dofPos.y;
+                }
+                half4 dofSum = (0.0).xxxx;
+                #endif
+
+                for (int i = 0; i < samples; i++)
+                {
+                    half t = (i + 0.5) / samples;
+                    half3 s = tex2Dlod(_MainTex, float4(UnityStereoScreenSpaceUVAdjust(pos, _MainTex_ST), 0, 0)).rgb;
+                    half3 filter = tex2Dlod(_ChromaticAberration_Spectrum, float4(t, 0, 0, 0)).rgb;
+
+                    sum += s * filter;
+                    filterSum += filter;
+                    pos += delta;
+
+                    #if DEPTH_OF_FIELD
+                    half4 sdof = tex2Dlod(_DepthOfFieldTex, float4(UnityStereoScreenSpaceUVAdjust(dofPos, _MainTex_ST), 0, 0)).rgba;
+                    dofSum += sdof * half4(filter, 1);
+                    dofPos += dofDelta;
+                    #endif
+                }
+
+                color = sum / filterSum;
+                #if DEPTH_OF_FIELD
+                dof = dofSum / half4(filterSum, samples);
+                #endif
+            }
+            #else
+            {
+                color = tex2D(_MainTex, i.uvSPR).rgb;
+            }
+            #endif
+
+            // Apply auto exposure if any
+            color *= autoExposure;
+
+            // Gamma space... Gah.
+            #if UNITY_COLORSPACE_GAMMA
+            {
+                color = GammaToLinearSpace(color);
+            }
+            #endif
+
+            // Depth of field
+            #if DEPTH_OF_FIELD
+            {
+                #if !CHROMATIC_ABERRATION
+                half4 dof = tex2D(_DepthOfFieldTex, i.uvFlippedSPR);
+                #endif
+                color = color * dof.a + dof.rgb * autoExposure;
+            }
+            #elif DEPTH_OF_FIELD_COC_VIEW
+            {
+                // Calculate the radiuses of CoC.
+                half4 src = tex2D(_DepthOfFieldTex, uv);
+                float depth = LinearEyeDepth(SAMPLE_DEPTH_TEXTURE(_CameraDepthTexture, i.uvFlippedSPR));
+                float coc = (depth - _DepthOfFieldParams.x) * _DepthOfFieldParams.y / depth;
+                coc *= 80;
+
+                // Visualize CoC (white -> red -> gray)
+                half3 rgb = lerp(half3(1, 0, 0), half3(1.0, 1.0, 1.0), saturate(-coc));
+                rgb = lerp(rgb, half3(0.4, 0.4, 0.4), saturate(coc));
+
+                // Black and white image overlay
+                rgb *= AcesLuminance(color) + 0.5;
+
+                // Gamma correction
+                #if !UNITY_COLORSPACE_GAMMA
+                {
+                    rgb = GammaToLinearSpace(rgb);
+                }
+                #endif
+
+                color = rgb;
+            }
+            #endif
+
+            // HDR Bloom
+            #if BLOOM
+            {
+                half3 bloom = UpsampleFilter(_BloomTex, i.uvFlippedSPR, _BloomTex_TexelSize.xy, _Bloom_Settings.x) * _Bloom_Settings.y;
+                color += bloom;
+
+                #if BLOOM_LENS_DIRT
+                {
+                    half3 dirt = tex2D(_Bloom_DirtTex, i.uvFlipped).rgb * _Bloom_DirtIntensity;
+                    color += bloom * dirt;
+                }
+                #endif
+            }
+            #endif
+
+            // Procedural vignette
+            #if VIGNETTE_CLASSIC
+            {
+                half2 d = abs(uv - _Vignette_Center) * _Vignette_Settings.x;
+                d = pow(d, _Vignette_Settings.z); // Roundness
+                half vfactor = pow(saturate(1.0 - dot(d, d)), _Vignette_Settings.y);
+                color *= lerp(_Vignette_Color, (1.0).xxx, vfactor);
+            }
+
+            // Perfectly round vignette
+            #elif VIGNETTE_ROUND
+            {
+                half2 d = abs(uv - _Vignette_Center) * _Vignette_Settings.x;
+                d.x *= _ScreenParams.x / _ScreenParams.y;
+                half vfactor = pow(saturate(1.0 - dot(d, d)), _Vignette_Settings.y);
+                color *= lerp(_Vignette_Color, (1.0).xxx, vfactor);
+            }
+
+            // Masked vignette
+            #elif VIGNETTE_MASKED
+            {
+                half vfactor = tex2D(_Vignette_Mask, uv).a;
+                half3 new_color = color * lerp(_Vignette_Color, (1.0).xxx, vfactor);
+                color = lerp(color, new_color, _Vignette_Opacity);
+            }
+            #endif
+
+            // HDR color grading & tonemapping
+            #if COLOR_GRADING
+            {
+                color *= _ExposureEV; // Exposure is in ev units (or 'stops')
+
+                half3 colorLogC = saturate(LinearToLogC(color));
+                color = ApplyLut2d(_LogLut, colorLogC, _LogLut_Params);
+            }
+            #elif COLOR_GRADING_LOG_VIEW
+            {
+                color *= _ExposureEV;
+                color = saturate(LinearToLogC(color));
+            }
+            #endif
+
+            //
+            // All the following effects happen in LDR
+            // ---------------------------------------------------------
+
+            color = saturate(color);
+
+            // Back to gamma space if needed
+            #if UNITY_COLORSPACE_GAMMA
+            {
+                color = LinearToGammaSpace(color);
+            }
+            #endif
+
+            // LDR user lut
+            #if USER_LUT
+            {
+                color = saturate(color);
+                half3 colorGraded;
+
+                #if !UNITY_COLORSPACE_GAMMA
+                {
+                    colorGraded = ApplyLut2d(_UserLut, LinearToGammaSpace(color), _UserLut_Params.xyz);
+                    colorGraded = GammaToLinearSpace(colorGraded);
+                }
+                #else
+                {
+                    colorGraded = ApplyLut2d(_UserLut, color, _UserLut_Params.xyz);
+                }
+                #endif
+
+                color = lerp(color, colorGraded, _UserLut_Params.w);
+            }
+            #endif
+
+            color = UberSecondPass(color, uv);
+
+            // Done !
+            return half4(color, 1.0);
+        }
+
+    ENDCG
+
+    SubShader
+    {
+        Cull Off ZWrite Off ZTest Always
+
+        // (0)
+        Pass
+        {
+            CGPROGRAM
+
+                #pragma vertex VertUber
+                #pragma fragment FragUber
+
+            ENDCG
+        }
+    }
+}
--- a/samples/XML/CSharpVSPackage.vstemplate
+++ b/samples/XML/CSharpVSPackage.vstemplate
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<VSTemplate Version="3.0.0" Type="Item" xmlns="http://schemas.microsoft.com/developer/vstemplate/2005" xmlns:sdk="http://schemas.microsoft.com/developer/vstemplate-sdkextension/2010">
+  <TemplateData>
+    <Name>Visual Studio Package</Name>
+    <Description>Visual Studio package loadable in Visual Studio</Description>
+    <Icon>VSPackage.ico</Icon>
+    <TemplateID>VsixVSPackageCSharp</TemplateID>
+    <AppliesTo>VSIX + CSharp</AppliesTo>
+    <ShowByDefault>false</ShowByDefault>
+    <ProjectType>CSharp</ProjectType>
+    <RequiredFrameworkVersion>4.5</RequiredFrameworkVersion>
+    <NumberOfParentCategoriesToRollUp>1</NumberOfParentCategoriesToRollUp>
+    <DefaultName>VSPackage.cs</DefaultName>
+  </TemplateData>
+  <TemplateContent>
+    <References>
+      <Reference>
+        <Assembly>Microsoft.CSharp</Assembly>
+      </Reference>
+      <Reference>
+        <Assembly>System</Assembly>
+      </Reference>
+      <Reference>
+        <Assembly>System.Core</Assembly>
+      </Reference>
+      <Reference>
+        <Assembly>System.Data</Assembly>
+      </Reference>
+      <Reference>
+        <Assembly>System.Design</Assembly>
+      </Reference>
+      <Reference>
+        <Assembly>System.Drawing</Assembly>
+      </Reference>
+      <Reference>
+        <Assembly>System.Windows.Forms</Assembly>
+      </Reference>
+      <Reference>
+        <Assembly>System.Xml</Assembly>
+      </Reference>
+    </References>
+
+    <ProjectItem ReplaceParameters="true" TargetFileName="$packageName$.cs" OpenInEditor="true">VsPkg.cs</ProjectItem>
+    <ProjectItem ReplaceParameters="false" TargetFileName="Resources\$packageName$.ico">Resources\Package.ico</ProjectItem>
+    <ProjectItem ReplaceParameters="true" TargetFileName="VSPackage.resx">VSPackage.resx</ProjectItem>
+    <ProjectItem ReplaceParameters="true" TargetFileName="source.extension.vsixmanifest" ItemType="None" SubType="Designer">source.extension.vsixmanifest</ProjectItem>
+
+    <CustomParameters>
+      <CustomParameter Name="$AddVsixManifestAsset$" Value="VsPackageFromSameProject" />
+      <CustomParameter Name="$productNameResourceId$" Value="110" />
+      <CustomParameter Name="$productDetailsResourceId$" Value="112" />
+      <CustomParameter Name="$iconResourceId$" Value="400" />
+      <CustomParameter Name="$packageName$" Value="$rootSafeItemName$" />
+      <CustomParameter Name="$packageGuid$" Value="$guid1$"/>
+    </CustomParameters>
+  </TemplateContent>
+  <WizardExtension>
+    <Assembly>Microsoft.Vsix.TemplatesPackage, Version=14.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
+    <FullClassName>Microsoft.Vsix.TemplatesPackage.VsixWizard</FullClassName>
+  </WizardExtension>
+  <WizardExtension>
+    <Assembly>NuGet.VisualStudio.Interop, Version=1.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</Assembly>
+    <FullClassName>NuGet.VisualStudio.TemplateWizard</FullClassName>
+  </WizardExtension>
+  <WizardData>
+    <packages repository="extension" repositoryId="Microsoft.Dev14.VsixTemplatesPackage.V2.443cca91-ec20-41e5-a165-f28e56b89650">
+      <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" />
+      <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" />
+      <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" />
+      <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" />
+      <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" />
+      <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" />
+      <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" />
+      <package id="Microsoft.VisualStudio.Shell.Interop.11.0" version="11.0.61030" />
+      <package id="Microsoft.VisualStudio.Shell.Interop.12.0" version="12.0.30110" />
+      <package id="Microsoft.VisualStudio.Shell.14.0" version="14.3.25407" />
+      <package id="Microsoft.VisualStudio.Shell.Immutable.11.0" version="11.0.50727" />
+      <package id="Microsoft.VisualStudio.Utilities" version="14.3.25407" />
+      <package id="Microsoft.VisualStudio.Shell.Immutable.10.0" version="10.0.30319" />
+      <package id="Microsoft.VisualStudio.Shell.Immutable.14.0" version="14.3.25407" />
+      <package id="Microsoft.VisualStudio.Threading" version="14.1.111" />
+      <package id="Microsoft.VisualStudio.Shell.Immutable.12.0" version="12.0.21003" />
+      <package id="Microsoft.VisualStudio.Imaging" version="14.3.25407" />
+      <package id="Microsoft.VisualStudio.Validation" version="14.1.111" />
+      <package id="Microsoft.VSSDK.BuildTools" version="14.3.25407" />
+    </packages>
+  </WizardData>
+</VSTemplate>
--- a/samples/XML/MDM.adml
+++ b/samples/XML/MDM.adml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  (c) 2016 Microsoft Corporation  -->
+<policyDefinitionResources xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+  <displayName>enter display name here</displayName>
+  <description>enter description here</description>
+  <resources>
+    <stringTable>
+      <string id="MDM">MDM</string>
+      <string id="MDM_MDM_DisplayName">Disable MDM Enrollment</string>
+      <string id="MDM_MDM_Help">This policy setting specifies whether Mobile Device Management (MDM) Enrollment is allowed. When MDM is enabled, it allows the user to have the computer remotely managed by a MDM Server.  
+
+If you do not configure this policy setting, MDM Enrollment will be enabled. 
+
+If you enable this policy setting, MDM Enrollment will be disabled for all users. It will not unenroll existing MDM enrollments.
+
+If you disable this policy setting, MDM Enrollment will be enabled for all users.
+</string>
+    </stringTable>
+  </resources>
+</policyDefinitionResources>
--- a/samples/XML/MDM.admx
+++ b/samples/XML/MDM.admx
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--  (c) 2016 Microsoft Corporation  -->
+<policyDefinitions xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" revision="1.0" schemaVersion="1.0" xmlns="http://schemas.microsoft.com/GroupPolicy/2006/07/PolicyDefinitions">
+  <policyNamespaces>
+    <target prefix="mdm" namespace="Microsoft.Policies.MDM" />
+    <using prefix="windows" namespace="Microsoft.Policies.Windows" />
+  </policyNamespaces>
+  <resources minRequiredRevision="1.0" />
+  <categories>
+    <category name="MDM" displayName="$(string.MDM)">
+      <parentCategory ref="windows:WindowsComponents" />
+    </category>
+  </categories>
+  <policies>
+    <policy name="MDM_MDM_DisplayName" class="Machine" displayName="$(string.MDM_MDM_DisplayName)" explainText="$(string.MDM_MDM_Help)" key="Software\Policies\Microsoft\Windows\CurrentVersion\MDM" valueName="DisableRegistration">
+      <parentCategory ref="MDM" />
+      <supportedOn ref="windows:SUPPORTED_Windows_10_0_NOSERVER" />
+      <enabledValue>
+        <decimal value="1" />
+      </enabledValue>
+      <disabledValue>
+        <decimal value="0" />
+      </disabledValue>
+    </policy>
+  </policies>
+</policyDefinitions>
--- a/samples/XML/racoon.mjml
+++ b/samples/XML/racoon.mjml
@@ -0,0 +1,240 @@
+<mjml>
+  <mj-body>
+    <mj-container background-color="#d6dde5">
+      <mj-section full-width="full-width" padding-bottom="20">
+      </mj-section>
+      <mj-navbar background-color="#ffffff">
+        <mj-column width="50%">
+          <mj-image href="https://mjml.io" src="http://191n.mj.am/img/191n/3s/x4u.png" alt="Racoon logo" align="center" padding="10">
+          </mj-image>
+        </mj-column>
+        <mj-column width="50%">
+          <mj-inline-links base-url="https://mjml.io" hamburger="hamburger" ico-color="#fa8739" padding-top="5px">
+            <mj-link href="https://mjml.io" color="#000000">home</mj-link>
+            <mj-link href="https://mjml.io" color="#000000">blog</mj-link>
+            <mj-link href="https://mjml.io" color="#000000">store</mj-link>
+          </mj-inline-links>
+        </mj-column>
+      </mj-navbar>
+      <mj-section background-color="#fa8739" padding-bottom="0" padding-top="0">
+        <mj-column width="200">
+          <mj-text align="left" color="#fff" font-size="40" padding-left="25" padding-right="25" padding-bottom="10" padding-top="10">
+            <p style="font-size: 17px;">SPRING PROMO</p>
+            <p>50%</p>
+            <p>OFFER</p>
+            <p style="font-size: 13px">Lorem ipsum dolor sit amet, consectetur adipiscing elit<br /></p>
+          </mj-text>
+          <mj-button background-color="#fff" color="#fa8739" font-size="16px" align="center" padding="15px 30px" border-radius="3px" href="https://mjml.io" padding-left="25" padding-right="25" padding-bottom="10" padding-top="10">
+            SHOP NOW
+          </mj-button>
+        </mj-column>
+        <mj-column width="400">
+          <mj-image src="http://191n.mj.am/img/191n/3s/xjg.jpg" alt="Clothes set" align="center" border="none" width="400" padding-left="0" padding-right="0" padding-bottom="0" padding-top="0">
+
+          </mj-image>
+        </mj-column>
+      </mj-section>
+      <mj-section background-color="#2f323b" padding-bottom="0" padding-top="0">
+        <mj-column width="25%">
+          <mj-image src="http://191n.mj.am/img/191n/3s/x4t.png" alt="Box free shipping" align="center" border="none" width="42" padding-left="0" padding-right="0" padding-bottom="10" padding-top="10">
+
+          </mj-image>
+        </mj-column>
+        <mj-column width="75%">
+          <mj-text align="left" color="#fff" font-size="18" padding-left="25" padding-right="25" padding-bottom="10" padding-top="10">
+            <p>FREE SHIPPING ON ORDER <span style="font-weight: bold;color: rgb(250, 135, 57);">OVER 55&#x20AC;</span></p>
+          </mj-text>
+        </mj-column>
+      </mj-section>
+      <mj-section background-color="#fff" padding-bottom="20" padding-top="10">
+        <mj-column vertical-align="bottom">
+          <mj-image src="http://191n.mj.am/img/191n/3s/x4v.jpg" alt="Chesterk tank" align="center" border="none" width="209" padding-left="0" padding-right="0" padding-bottom="20" padding-top="30">
+
+          </mj-image>
+          <mj-text font-weight="bold" align="center" color="#000" font-size="15" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p>CHESTERK TANK</p>
+            <p style="color: rgb(250, 135, 57);">15&#x20AC;</p>
+          </mj-text>
+          <mj-button background-color="#fa8739" color="#fff" font-size="13" align="center" padding="15px 30px" border-radius="3px" href="https://mjml.io" padding-bottom="10" padding-top="0">
+            BUY NOW
+          </mj-button>
+        </mj-column>
+        <mj-column vertical-align="bottom">
+          <mj-image src="http://191n.mj.am/img/191n/3s/x4g.jpg" alt="Beyond backpack" align="center" border="none" width="178" padding-left="0" padding-right="0" padding-bottom="20" padding-top="30">
+
+          </mj-image>
+          <mj-text font-weight="bold" align="center" color="#000" font-size="15" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p>BEYOND BACKPACK</p>
+            <p style="color: rgb(250, 135, 57);">20&#x20AC;</p>
+          </mj-text>
+
+          <mj-button background-color="#fa8739" color="#fff" font-size="13" align="center" padding="15px 30px" border-radius="3px" href="https://mjml.io" padding-bottom="10" padding-top="0">
+            BUY NOW
+          </mj-button>
+        </mj-column>
+        <mj-column vertical-align="bottom">
+          <mj-image src="http://191n.mj.am/img/191n/3s/x46.jpg" alt="Jensen shorts" align="center" border="none" width="182" padding-left="0" padding-right="0" padding-bottom="20" padding-top="30">
+
+          </mj-image>
+          <mj-text font-weight="bold" align="center" color="#000" font-size="15" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p>JENSEN SHORTS</p>
+            <p style="color: rgb(250, 135, 57);">28&#x20AC;</p>
+          </mj-text>
+          <mj-button background-color="#fa8739" color="#fff" font-size="13" align="center" padding="15px 30px" border-radius="3px" href="https://mjml.io" padding-bottom="10" padding-top="0">
+            BUY NOW
+          </mj-button>
+        </mj-column>
+      </mj-section>
+      <mj-section background-color="#fff" padding-bottom="20" padding-top="10">
+        <mj-column vertical-align="bottom">
+          <mj-image src="http://191n.mj.am/img/191n/3s/x4h.jpg" alt="Verdant cap" align="center" border="none" width="129" padding-left="0" padding-right="0" padding-bottom="20" padding-top="20">
+
+          </mj-image>
+          <mj-text font-weight="bold" align="center" color="#000" font-size="15" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p>VERDANT CAP</p>
+            <p style="color: rgb(250, 135, 57);">20&#x20AC;</p>
+          </mj-text>
+          <mj-button background-color="#fa8739" color="#fff" font-size="13" align="center" border="none" padding="15px 30px" border-radius="3px" href="https://mjml.io" padding-left="25" padding-right="25" padding-bottom="10" padding-top="0">
+            BUY NOW
+          </mj-button>
+        </mj-column>
+        <mj-column vertical-align="bottom">
+          <mj-image src="http://191n.mj.am/img/191n/3s/x4i.jpg" alt="Blake polo shirt" align="center" border="none" width="208" padding-left="0" padding-right="0" padding-bottom="20" padding-top="20">
+
+          </mj-image>
+          <mj-text font-weight="bold" align="center" color="#000" font-size="15" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p>BLAKE POLO SHIRT</p>
+            <p style="color: rgb(250, 135, 57);">25&#x20AC;</p>
+          </mj-text>
+          <mj-button background-color="#fa8739" color="#fff" font-size="13" align="center" padding="15px 30px" border-radius="3px" href="https://mjml.io" padding-bottom="10" padding-top="0">
+            BUY NOW
+          </mj-button>
+        </mj-column>
+        <mj-column vertical-align="bottom">
+          <mj-image src="http://191n.mj.am/img/191n/3s/x4j.jpg" alt="Sketch floral" align="center" border="none" width="72" padding-left="0" padding-right="0" padding-bottom="20" padding-top="20">
+
+          </mj-image>
+          <mj-text font-weight="bold" align="center" color="#000" font-size="15" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p>SKETCH FLORAL</p>
+            <p style="color: rgb(250, 135, 57);">23&#x20AC;</p>
+          </mj-text>
+          <mj-button background-color="#fa8739" color="#fff" font-size="13" align="center" padding="15px 30px" border-radius="3px" href="https://mjml.io" padding-bottom="10" padding-top="0">
+            BUY NOW
+          </mj-button>
+        </mj-column>
+      </mj-section>
+      <mj-section background-color="#fa8739" padding-bottom="0" padding-top="0">
+        <mj-column>
+          <mj-image src="http://191n.mj.am/img/191n/3s/x4k.jpg" alt="Man 1" width="301" padding-left="0" padding-right="0" padding-bottom="0" padding-top="0">
+          </mj-image>
+        </mj-column>
+        <mj-column width="50%">
+          <mj-text align="left" color="#fff" font-size="13" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p style="font-size: 19px;">ANDERSON SWEATER</p>
+            <p style="font-size: 36px;">75&#x20AC;</p>
+            <p>The Anderson Sweater features a floral all-over print with contrast colour.</p>
+          </mj-text>
+          <mj-button background-color="#fff" color="#fa8739" padding="15px 30px" border-radius="3px" href="https://mjml.io" padding-bottom="10" padding-top="0">
+            BUY NOW
+          </mj-button>
+        </mj-column>
+      </mj-section>
+      <mj-section background-color="#2f323b" padding-bottom="0" padding-top="0">
+        <mj-column>
+          <mj-text align="left" color="#fff" font-size="13" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p style="font-size: 19px;">ALDER TWO JONES JACKET</p>
+            <p style="font-size: 36px;">100&#x20AC;</p>
+            <p>Colour-block design, zip entry, oxford hood lining, side pockets &amp; TC lining.</p>
+          </mj-text>
+          <mj-button background-color="#fa8739" color="#fff" padding="15px 30px" border-radius="3px" href="https://mjml.io" padding-bottom="10" padding-top="0">
+            BUY NOW
+          </mj-button>
+        </mj-column>
+        <mj-column>
+          <mj-image src="http://191n.mj.am/img/191n/3s/xj6.jpg" alt="Man 2" align="center" border="none" width="302" padding-left="0" padding-right="0" padding-bottom="0" padding-top="0">
+
+          </mj-image>
+        </mj-column>
+      </mj-section>
+      <mj-section background-color="#fa8739" padding-bottom="0" padding-top="0">
+        <mj-column>
+          <mj-text align="center" color="#fff" font-size="13" padding-left="25" padding-right="25" padding-bottom="10" padding-top="10">
+            <p style="font-size: 14px;">DISCOVER OUR</p>
+            <p style="font-size: 27px;">SUMMER COLLECTION</p>
+          </mj-text>
+        </mj-column>
+      </mj-section>
+      <mj-section background-color="#fff" padding-bottom="20" padding-top="20">
+        <mj-column>
+          <mj-image src="http://191n.mj.am/img/191n/3s/x4q.jpg" alt="Topaz C3 shoes" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+          </mj-image>
+          <mj-text align="center" color="#000" font-size="15" font-weight="bold" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p>TOPAZ C3 SHOES</p>
+            <p style="color: rgb(250, 135, 57);">70&#x20AC;</p>
+          </mj-text>
+          <mj-button background-color="#fa8739" color="#fff" font-size="13" align="center" padding="15px 30px" border-radius="3px" href="https://mjml.io" padding-bottom="10" padding-top="0">
+            BUY NOW
+          </mj-button>
+        </mj-column>
+        <mj-column>
+          <mj-image src="http://191n.mj.am/img/191n/3s/x4r.jpg" alt="Camden backpack" align="center" border="none" width="199" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+
+          </mj-image>
+          <mj-text align="center" color="#000" font-size="15" font-weight="bold" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p>CAMDEN BACKPACK</p>
+            <p style="color: rgb(250, 135, 57);">50&#x20AC;</p>
+          </mj-text>
+          <mj-button background-color="#fa8739" color="#fff" padding="15px 30px" border-radius="3px" href="https://mjml.io" padding-bottom="10" padding-top="0">
+            BUY NOW
+          </mj-button>
+        </mj-column>
+      </mj-section>
+      <mj-section background-color="#2f323b" padding-bottom="20" padding-top="20">
+        <mj-column>
+          <mj-image src="http://191n.mj.am/img/191n/3s/x47.png" alt="Cards" width="72">
+          </mj-image>
+          <mj-text align="center" color="#fff" font-size="13" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p style="font-size: 15px;font-weight: bold;">PAYMENT METHODS</p>
+            <p>We accept all majors payments options</p>
+          </mj-text>
+        </mj-column>
+        <mj-column>
+          <mj-image src="http://191n.mj.am/img/191n/3s/x48.png" alt="Currencies" align="center" border="none" width="70" padding-left="25" padding-right="25" padding-bottom="0" padding-top="10">
+
+          </mj-image>
+          <mj-text align="center" color="#fff" font-size="13" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p style="font-size: 15px;font-weight: bold;">CURRENCIES CHOICE</p>
+            <p>You have the choice to pay with your own currencies</p>
+          </mj-text>
+        </mj-column>
+        <mj-column>
+          <mj-image src="http://191n.mj.am/img/191n/3s/x4y.png" alt="Express" align="center" border="none" width="82" padding-left="25" padding-right="25" padding-bottom="8" padding-top="10">
+
+          </mj-image>
+          <mj-text align="center" color="#fff" font-size="13" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p style="font-size: 15px;font-weight: bold;">EXPRESS SHIPPING</p>
+            <p>Delivered tomorrow before noon</p>
+          </mj-text>
+        </mj-column>
+      </mj-section>
+      <mj-section background-color="#fa8739" padding-bottom="0" padding-top="0">
+        <mj-column>
+          <mj-image src="http://191n.mj.am/img/191n/3s/x49.png" alt="Racoon logo" align="center" border="none" width="180" padding-left="0" padding-right="0" padding-bottom="0" padding-top="10">
+          </mj-image>
+        </mj-column>
+        <mj-column>
+          <mj-text align="center" color="#fff" font-size="13" padding-left="25" padding-right="25" padding-bottom="0" padding-top="0">
+            <p><a href="https://mjml.io" style="text-decoration: none; color: inherit;">Privacy policy</a></p>
+          </mj-text>
+        </mj-column>
+        <mj-column>
+          <mj-social font-size="13" text-mode="false" facebook-href="[[SHORT_PERMALINK]]" twitter-href="[[SHORT_PERMALINK]]" google-href="[[SHORT_PERMALINK]]" mode="horizontal" display="facebook twitter google" padding-left="25" padding-right="25" padding-bottom="10"
+            padding-top="10">
+          </mj-social>
+        </mj-column>
+      </mj-section>
+      <mj-section padding-bottom="20" padding-top="20">
+      </mj-section>
+    </mj-container>
+  </mj-body>
+</mjml>
--- a/samples/XML/real-estate.mjml
+++ b/samples/XML/real-estate.mjml
@@ -0,0 +1,182 @@
+<mjml>
+  <mj-head>
+    <mj-title>Say hello to RealEstate</mj-title>
+    <mj-font name="Roboto" href="https://fonts.googleapis.com/css?family=Alice" />
+    <mj-font name="Roboto" href="https://fonts.googleapis.com/css?family=Roboto:400,700" />
+    <mj-attributes>
+      <mj-all font-family="Roboto, Helvetica, Arial, sans-serif" padding="0" />
+      <mj-text font-weight="400" font-size="14" color="#000000" line-height="21px" />
+    </mj-attributes>
+  </mj-head>
+
+  <mj-body>
+    <mj-container background-color="#EAE8E5">
+
+      <mj-section padding="20px 0 0 0">
+        <mj-column>
+          <mj-image src="http://nimus.de/share/tpl-realestate/box-head.png" alt="" align="center" border="none" padding="0"></mj-image>
+        </mj-column>
+      </mj-section>
+
+      <mj-section padding-top="40px" background-color="#FFFFFF">
+        <mj-column width="570px">
+          <mj-text align="left" padding="0 20px" color="#1D83A8" font-size="36" line-height="40px" font-family="Alice, Helvetica, Arial, sans-serif">
+            Real Estate
+          </mj-text>
+          <mj-text align="left" padding="0 20px">
+            <strong><span style="font-size: 40px;">⚊</span></strong><br /><br /></mj-text>
+        </mj-column>
+      </mj-section>
+
+      <mj-section background-color="#FFFFFF">
+        <mj-column width="300px">
+          <mj-text align="left" padding="0 20px 30px 20px">
+            <strong>Aliquam lorem ante, dapibus in hasellus viverra nulla</strong> ut metus varius laoreet. Quisque rutrum lorem dellorus. Aenean imperdiet.
+          </mj-text>
+        </mj-column>
+        <mj-column width="260px">
+          <mj-image src="http://nimus.de/share/tpl-realestate/icon-1.png" alt="" padding-bottom="30px" width="260" align="center" border="none"></mj-image>
+        </mj-column>
+      </mj-section>
+
+      <mj-section background-url="http://nimus.de/share/tpl-realestate/img-1.png" vertical-align="middle" background-size="cover" padding="30px" background-repeat="no-repeat">
+        <mj-column vertical-align="middle" width="60%">
+          <mj-text align="center" padding="40px 30px" color="#FFFFFF" font-size="42px" line-height="48px" font-family="Alice, Helvetica, Arial, sans-serif">
+            Villa Semperin
+          </mj-text>
+        </mj-column>
+        <mj-column vertical-align="middle" width="40%" background-color="#FFFFFF">
+          <mj-image src="http://nimus.de/share/tpl-realestate/box-top.png" width="220px" alt="" align="center" border="none"></mj-image>
+          <mj-text align="center" padding="20px 20px 0 20px" color="#1D83A8" font-size="26" line-height="30px" font-family="Alice, Helvetica, Arial, sans-serif">
+            – first offer –
+          </mj-text>
+          <mj-text align="center" padding="10px 20px" font-size="22" line-height="30px">340,000 $</mj-text>
+          <mj-text align="center" padding="0 20px">Nascetur ridiculus mus. Donec quam felis, ultricies nec</mj-text>
+          <mj-button background-color="#F44E3C" color="white" padding="20px 20px 30px 20px" border-radius="20px">
+            view details
+          </mj-button>
+        </mj-column>
+      </mj-section>
+
+
+      <mj-section padding="30px" background-color="#FFFFFF">
+        <mj-column width="60%">
+          <mj-text align="center" padding-bottom="20px" font-size="26" line-height="30px" font-family="Alice, Helvetica, Arial, sans-serif">
+            Lorem Ipsum
+          </mj-text>
+          <mj-text align="center" padding="0 40px">
+            Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Lorem Ipsum
+          </mj-text>
+          <mj-image src="http://nimus.de/share/tpl-realestate/icon-2.png" alt="" padding="30px 0 10px 0" width="50" align="center" border="none"></mj-image>
+        </mj-column>
+        <mj-column width="40%" background-color="#FFFFFF">
+          <mj-image src="http://nimus.de/share/tpl-realestate/img-2.png" width="216px" alt="" align="center" border="none"></mj-image>
+        </mj-column>
+      </mj-section>
+
+      <mj-section padding="20px" background-color="#FFFFFF">
+        <mj-column width="100%">
+          <mj-image src="http://nimus.de/share/tpl-realestate/symbol-1.png" alt="" width="292px" align="left" border="none"></mj-image>
+        </mj-column>
+      </mj-section>
+
+      <mj-section padding="0 20px" background-color="#FFFFFF">
+        <mj-column>
+          <mj-text align="center" font-size="26" line-height="30px" font-family="Alice, Helvetica, Arial, sans-serif">
+            Lorem Ipsum
+          </mj-text>
+          <mj-divider width="20px" padding="20px 0" border-width="2px" border-color="#000000" />
+          <mj-text align="center" padding="0 40px">
+            Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Lorem Ipsum
+          </mj-text>
+          <mj-button background-color="#F44E3C" color="white" padding="20px 20px 10px 20px" border-radius="20px">
+            Call to action
+          </mj-button>
+        </mj-column>
+      </mj-section>
+
+      <mj-section padding="20px" background-color="#FFFFFF">
+        <mj-column width="100%">
+          <mj-image src="http://nimus.de/share/tpl-realestate/symbol-2.png" alt="" width="213px" align="right" border="none"></mj-image>
+        </mj-column>
+      </mj-section>
+
+
+      <mj-section padding="0 30px 30px" background-color="#FFFFFF">
+        <mj-column width="55%">
+          <mj-image src="http://nimus.de/share/tpl-realestate/img-3.png" width="280px" padding-bottom="20px" alt="" align="center" border="none"></mj-image>
+        </mj-column>
+        <mj-column width="45%" background-color="#FFFFFF">
+          <mj-text align="center" padding-bottom="20px" font-size="26" line-height="30px" font-family="Alice, Helvetica, Arial, sans-serif">
+            Lorem Ipsum
+          </mj-text>
+          <mj-text align="center" padding="0 40px">
+            Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum.
+          </mj-text>
+          <mj-image src="http://nimus.de/share/tpl-realestate/icon-3.png" alt="" padding="30px 0 10px 0" width="50" align="center" border="none"></mj-image>
+        </mj-column>
+      </mj-section>
+
+      <mj-section padding="0 20px" background-color="#FFFFFF">
+        <mj-column>
+          <mj-text align="center" font-size="26" line-height="30px" font-family="Alice, Helvetica, Arial, sans-serif">
+            Nullam dictum felis eu pede
+          </mj-text>
+          <mj-divider width="20px" padding="20px 0" border-width="2px" border-color="#000000" />
+        </mj-column>
+      </mj-section>
+
+      <mj-section padding="0 20px 30px" background-color="#FFFFFF">
+        <mj-column width="33%">
+          <mj-text align="left" padding="0 15px 15px">
+            <strong>Aliquam lorem ante,</strong> dapibus in, viverra quis, feugiat a, tellus. Phasellus viverra nulla ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Lorem Ipsum
+          </mj-text>
+        </mj-column>
+        <mj-column width="34%">
+          <mj-text align="left" padding="0 15px 15px">
+            <strong>Phasellus viverra null aliquam lorem ante</strong>, dapibus in, viverra quis, feugiat a, tellus ut metus varius laoreet. Quisque rutrum. Aenean imperdiet. Lorem Ipsum
+          </mj-text>
+        </mj-column>
+        <mj-column width="33%">
+          <mj-text align="left" padding="0 15px 15px">
+            <strong>Quisque rutrum.</strong> Aenean imperdiet viverra nulla ut metus varius laoreet. Aliquam lorem ante, dapibus in, viverra quis, feugiat a, tellus. Lorem Ipsum
+          </mj-text>
+        </mj-column>
+      </mj-section>
+
+      <mj-section background-url="http://nimus.de/share/tpl-realestate/img-4.png" vertical-align="middle" background-size="cover" padding="30px" background-repeat="no-repeat">
+        <mj-column vertical-align="middle" width="40%" background-color="#FFFFFF">
+          <mj-image src="http://nimus.de/share/tpl-realestate/box-top.png" width="220px" alt="" align="center" border="none"></mj-image>
+          <mj-text align="center" padding="20px 20px 0 20px" color="#1D83A8" font-size="26" line-height="30px" font-family="Alice, Helvetica, Arial, sans-serif">
+            – 2. offer –
+          </mj-text>
+          <mj-text align="center" padding="10px 20px" font-size="22" line-height="30px">198,700 $</mj-text>
+          <mj-text align="center" padding="0 20px">Donec quam felis, ultricies Nascetur ridiculus mus.</mj-text>
+          <mj-button background-color="#F44E3C" color="white" padding="20px 20px 30px 20px" border-radius="20px">
+            view details
+          </mj-button>
+        </mj-column>
+        <mj-column vertical-align="middle" width="60%">
+          <mj-text align="center" padding="40px 30px" color="#FFFFFF" font-size="42px" line-height="48px" font-family="Alice, Helvetica, Arial, sans-serif">
+            Window House 23
+          </mj-text>
+        </mj-column>
+      </mj-section>
+
+      <mj-section padding="40px 20px" background-color="#FFFFFF">
+        <mj-column width="100%">
+          <mj-image src="http://nimus.de/share/tpl-realestate/icon-1.png" alt="" width="130px" align="center" border="none"></mj-image>
+        </mj-column>
+      </mj-section>
+
+      <mj-section padding="10px 0 20px 0">
+        <mj-column>
+          <mj-text align="center" color="#9B9B9B" font-size="11px"><a href="#" style="color: #9B9B9B;">Unsubscribe</a> from this newsletter<br>Icon made by Freepik from <a href="http://www.flaticon.com" target="_blank" style="color: #9B9B9B; text-decoration: none;">www.flaticon.com</a><br>
+            <a href="http://svenhaustein.de" style="color: #9B9B9B; text-decoration:none;">Made by svenhaustein.de</a>
+          </mj-text>
+        </mj-column>
+      </mj-section>
+
+    </mj-container>
+  </mj-body>
+</mjml>
--- a/samples/XML/source.extension.vsixmanifest
+++ b/samples/XML/source.extension.vsixmanifest
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
+  <Metadata>
+    <Identity Id="$guid1$" Version="1.0" Language="en-US" Publisher="$registeredorganization$" />
+    <DisplayName>$packageName$</DisplayName>
+    <Description>$packageName$ Visual Studio Package</Description>
+  </Metadata>
+  <Installation>
+    <InstallationTarget Version="[14.0,15.0)" Id="Microsoft.VisualStudio.Community" />
+  </Installation>
+  <Dependencies>
+    <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
+    <Dependency Id="Microsoft.VisualStudio.MPF.14.0" DisplayName="Visual Studio MPF 14.0" d:Source="Installed" Version="[14.0]" />
+  </Dependencies>
+  <Assets>
+    <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
+  </Assets>
+</PackageManifest>
--- a/test/test_heuristics.rb
+++ b/test/test_heuristics.rb
@@ -106,7 +106,7 @@ class TestHeuristcs < Minitest::Test

  def test_f_by_heuristics
    assert_heuristics({
-      "FORTRAN" => all_fixtures("FORTRAN", "*.f") + all_fixtures("FORTRAN", "*.for"),
+      "Fortran" => all_fixtures("Fortran", "*.f") + all_fixtures("Fortran", "*.for"),
      "Forth" => all_fixtures("Forth", "*.f") + all_fixtures("Forth", "*.for")
    })
  end
@@ -144,6 +144,15 @@ class TestHeuristcs < Minitest::Test
    })
  end

+  def test_l_by_heuristics
+    assert_heuristics({
+      "Common Lisp" => all_fixtures("Common Lisp", "*.l"),
+      "Lex" => all_fixtures("Lex", "*.l"),
+      "Roff" => all_fixtures("Roff", "*.l"),
+      "PicoLisp" => all_fixtures("PicoLisp", "*.l")
+    })
+  end
+
  def test_ls_by_heuristics
    assert_heuristics({
      "LiveScript" => all_fixtures("LiveScript", "*.ls"),
@@ -174,7 +183,22 @@ class TestHeuristcs < Minitest::Test
  def test_md_by_heuristics
    assert_heuristics({
      "Markdown" => all_fixtures("Markdown", "*.md"),
-      "GCC machine description" => all_fixtures("GCC machine description", "*.md")
+      "GCC Machine Description" => all_fixtures("GCC Machine Description", "*.md")
+    })
+  end
+
+  def test_ms_by_heuristics
+    assert_heuristics({
+      "Roff" => all_fixtures("Roff", "*.ms"),
+      "Unix Assembly" => all_fixtures("Unix Assembly", "*.ms"),
+      "MAXScript" => all_fixtures("MAXScript", "*.ms")
+    })
+  end
+
+  def test_n_by_heuristics
+    assert_heuristics({
+      "Roff" => all_fixtures("Roff", "*.n"),
+      "Nemerle" => all_fixtures("Nemerle", "*.n")
    })
  end

@@ -230,6 +254,13 @@ class TestHeuristcs < Minitest::Test
    })
  end

+  def test_rno_by_heuristics
+    assert_heuristics({
+      "RUNOFF" => all_fixtures("RUNOFF", "*.rno"),
+      "Roff" => all_fixtures("Roff", "*.rno")
+    })
+  end
+
  # Candidate languages = ["Scala", "SuperCollider"]
  def test_sc_supercollider_scala_by_heuristics
    assert_heuristics({
--- a/vendor/CodeMirror
+++ b/vendor/CodeMirror
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -165,6 +165,8 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Java Server Pages:** [textmate/java.tmbundle](https://github.com/textmate/java.tmbundle)
 - **JavaScript:** [atom/language-javascript](https://github.com/atom/language-javascript)
 - **JFlex:** [jflex-de/jflex.tmbundle](https://github.com/jflex-de/jflex.tmbundle)
+- **Jison:** [cdibbs/language-jison](https://github.com/cdibbs/language-jison)
+- **Jison Lex:** [cdibbs/language-jison](https://github.com/cdibbs/language-jison)
 - **JSON:** [textmate/json.tmbundle](https://github.com/textmate/json.tmbundle)
 - **JSON5:** [atom/language-javascript](https://github.com/atom/language-javascript)
 - **JSONiq:** [wcandillon/language-jsoniq](https://github.com/wcandillon/language-jsoniq)
@@ -270,8 +272,8 @@ This is a list of grammars that Linguist selects to provide syntax highlighting
 - **Puppet:** [russCloak/SublimePuppet](https://github.com/russCloak/SublimePuppet)
 - **PureScript:** [purescript-contrib/atom-language-purescript](https://github.com/purescript-contrib/atom-language-purescript)
 - **Python:** [MagicStack/MagicPython](https://github.com/MagicStack/MagicPython)
- **Python console:** [atom/language-python](https://github.com/atom/language-python)
- **Python traceback:** [atom/language-python](https://github.com/atom/language-python)
+- **Python console:** [MagicStack/MagicPython](https://github.com/MagicStack/MagicPython)
+- **Python traceback:** [MagicStack/MagicPython](https://github.com/MagicStack/MagicPython)
 - **QMake:** [textmate/cpp-qt.tmbundle](https://github.com/textmate/cpp-qt.tmbundle)
 - **QML:** [skozlovf/Sublime-QML](https://github.com/skozlovf/Sublime-QML)
 - **R:** [textmate/r.tmbundle](https://github.com/textmate/r.tmbundle)
--- a/vendor/grammars/Elm
+++ b/vendor/grammars/Elm
--- a/vendor/grammars/MagicPython
+++ b/vendor/grammars/MagicPython
--- a/vendor/grammars/NimLime
+++ b/vendor/grammars/NimLime
--- a/vendor/grammars/Sublime-SQF-Language
+++ b/vendor/grammars/Sublime-SQF-Language
--- a/vendor/grammars/SublimeEthereum
+++ b/vendor/grammars/SublimeEthereum
--- a/vendor/grammars/SublimePuppet
+++ b/vendor/grammars/SublimePuppet
--- a/vendor/grammars/Terraform.tmLanguage
+++ b/vendor/grammars/Terraform.tmLanguage
--- a/vendor/grammars/atom-language-clean
+++ b/vendor/grammars/atom-language-clean
--- a/vendor/grammars/atom-language-perl6
+++ b/vendor/grammars/atom-language-perl6
--- a/vendor/grammars/elixir-tmbundle
+++ b/vendor/grammars/elixir-tmbundle
--- a/vendor/grammars/html.tmbundle
+++ b/vendor/grammars/html.tmbundle
--- a/vendor/grammars/language-blade
+++ b/vendor/grammars/language-blade
--- a/vendor/grammars/language-clojure
+++ b/vendor/grammars/language-clojure
--- a/vendor/grammars/language-coffee-script
+++ b/vendor/grammars/language-coffee-script
--- a/vendor/grammars/language-crystal
+++ b/vendor/grammars/language-crystal
--- a/vendor/grammars/language-csound
+++ b/vendor/grammars/language-csound
--- a/vendor/grammars/language-css
+++ b/vendor/grammars/language-css
--- a/vendor/grammars/language-gfm
+++ b/vendor/grammars/language-gfm
--- a/vendor/grammars/language-jison
+++ b/vendor/grammars/language-jison
--- a/vendor/grammars/language-jolie
+++ b/vendor/grammars/language-jolie
--- a/vendor/grammars/language-renpy
+++ b/vendor/grammars/language-renpy
--- a/vendor/grammars/language-restructuredtext
+++ b/vendor/grammars/language-restructuredtext
--- a/vendor/grammars/language-roff
+++ b/vendor/grammars/language-roff
--- a/vendor/grammars/language-rpm-spec
+++ b/vendor/grammars/language-rpm-spec
--- a/vendor/grammars/language-xbase
+++ b/vendor/grammars/language-xbase
--- a/vendor/grammars/language-yaml
+++ b/vendor/grammars/language-yaml
--- a/vendor/grammars/latex.tmbundle
+++ b/vendor/grammars/latex.tmbundle
--- a/vendor/grammars/marko-tmbundle
+++ b/vendor/grammars/marko-tmbundle
--- a/vendor/grammars/sass-textmate-bundle
+++ b/vendor/grammars/sass-textmate-bundle
--- a/vendor/grammars/sublime-typescript
+++ b/vendor/grammars/sublime-typescript
--- a/vendor/grammars/sublimeassembly
+++ b/vendor/grammars/sublimeassembly
--- a/vendor/grammars/vue-syntax-highlight
+++ b/vendor/grammars/vue-syntax-highlight
--- a/vendor/licenses/grammar/language-jolie.txt
+++ b/vendor/licenses/grammar/language-jolie.txt
@@ -0,0 +1,26 @@
+---
+type: grammar
+name: language-jolie
+license: mit
+---
+The MIT License (MIT)
+
+Copyright (c) 2015 Fabrizio Montesi <famontesi@gmail.com>
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
Author	SHA1	Message	Date
Colin Seymour	5e2c79e950	Bump version to v5.0.10 (#3604 )	2017-05-05 18:49:35 +01:00
Colin Seymour	e93f41f097	Revert "Switch the PHP grammar to the upstream repo (#3575 )" (#3603 ) * Revert "Switch the PHP grammar to the upstream repo (#3575)" Manually reverting this as it breaks PHP syntax highlighting on github.com. * Update submodule ref	2017-05-05 17:11:29 +01:00
Colin Seymour	994bc1f135	Release v5.0.9 (#3597 ) * Update all grammars * Update atom-language-clean grammar to match * Don't update reason grammer There seems to be a problem with the 1.3.5 release in that the conversion isn't producing a reason entry so doesn't match whats in grammar.yml * Bump version to 5.0.9 * Update grammars * Don't update javascript grammar The current grammar has a known issue and is pending the fix in https://github.com/atom/language-javascript/pull/497	2017-05-03 14:49:26 +01:00
John Gardner	44f03e64c1	Merge heuristics for disambiguating ".t" files (#3587 ) References: github/linguist#3546	2017-04-29 11:15:39 +02:00
Jacob Elder	4166f2e89d	Clarify support for generated code (#3588 ) * Clarify support for generated code * Incorporate feedback * TIL about how .gitattributes matching works	2017-04-28 16:20:22 -07:00
John Gardner	1a8f19c6f2	Fix numbering of ordered lists (#3586 )	2017-04-28 14:02:38 -07:00
Santiago M. Mola	c0e242358a	Fix heuristics after rename (#3556 ) * fix Roff detection in heuristics This affects extensions .l, .ms, .n and .rno. Groff was renamed to Roff in 673aeb32b9851cc58429c4b598c876292aaf70c7, but heuristic was not updated. * replace FORTRAN with Fortran It was already renamed in most places since 4fd8fce08574809aa58e9771e2a9da5d135127be heuristics.rb was missing though. * fix caseness of GCC Machine Description	2017-04-26 15:31:36 -07:00
thesave	eb38c8dcf8	[Add Language] Jolie (#3574 ) * added support for Jolie language * added support for Jolie language * added samples for Jolie	2017-04-26 11:04:25 -07:00
Trent Schafer	f146b4afbd	New extension support for PL/SQL language (#2735 ) * Add additional PL/SQL file extensions * Add PL/SQL samples for .ddl and .prc * Fix sort order of PL/SQL extensions * Restore vendor/grammars/assembly. * Restore `pls` as primary PL/SQL extension * Add tpb to go with tps	2017-04-26 11:03:01 -07:00
Nicolas Garnier	db15d0f5d2	Added MJML as an XML extension (#3582 )	2017-04-26 19:24:57 +10:00
Michael Grafnetter	e6d57c771d	Add .admx and .adml as extensions for XML (#3580 ) * Add .admx and .adml as extensions for XML * Fixed the order of extensions	2017-04-24 09:55:22 -07:00
Nathan Phillip Brink	eef0335c5f	Clarify description of implicit alias. (#3578 ) * Clarify description of implicit alias. I was trying to look up the alias to use for DNS Zone. From the docs the alias I should use would be dns zone, but in reality it is dns-zone. This change updates the comments to describe how to derive the implicit name of a given alias. * Further clarify description of implicit alias. @pchaigno requested replacing the Ruby with English.	2017-04-24 09:54:37 -07:00
Christoph Pojer	461c27c066	Revert "Added Jest snapshot test files as generated src (#3572 )" (#3579 ) This reverts commit `f38d6bd124`.	2017-04-22 14:20:54 +02:00
Matvei Stefarov	59d67d6743	Treat vstemplate and vsixmanifest as XML (#3517 )	2017-04-22 09:25:50 +01:00
Sandy Armstrong	7aeeb82d3d	Treat Xamarin .workbook files as markdown (#3500 ) * Treat Xamarin .workbook files as markdown Xamarin Workbook files are interactive coding documents for C#, serialized as markdown files. They include a YAML front matter header block with some metadata. Interactive code cells are included as `csharp` fenced code blocks. An example can be found here: https://github.com/xamarin/Workbooks/blob/master/csharp/csharp6/csharp6.workbook Treated as markdown, it would appear like so: https://gist.github.com/sandyarmstrong/e331dfeaf89cbce89043a1c31faa1297 * Add .workbook sample Source: https://github.com/xamarin/Workbooks/blob/master/csharp/csharp6/csharp6.workbook	2017-04-20 15:29:17 +01:00
Christophe Coevoet	c98ca20076	Switch the PHP grammar to the upstream repo (#3575 ) * Switch the PHP grammar to the upstream repo * Update all URLs pointing to the PHP grammar bundle	2017-04-20 14:40:44 +01:00
Paul Chaignon	4e0b5f02aa	Fix usage line in binary (#3564 ) Linguist cannot work on any directory; it needs to be a Git repository.	2017-04-20 10:18:03 +01:00
Tim Jones	8da7cb805e	Add .cginc extension to HLSL language (#3491 ) * Add .cginc extension to HLSL language * Move extension to correct position * Add representative sample .cginc file	2017-04-20 09:48:48 +01:00
Dorian	e5e81a8560	Add .irbc and Rakefile to matching ruby filenames (#3457 )	2017-04-20 09:41:31 +01:00
Tim Jones	dd53fa1585	Add ShaderLab language (#3490 ) * Add ShaderLab language * Update HLSL and ShaderLab grammars to latest version * Add .shader extension back to GLSL language * Add sample GLSL .shader files Note that these are copies of existing GLSL samples, renamed to have the .shader extension.	2017-04-20 09:04:08 +01:00
Daniel F Moisset	354a8f079a	Add suport for python typeshed (.pyi) extension (#3548 )	2017-04-20 09:01:41 +01:00
Hank Brekke	f38d6bd124	Added Jest snapshot test files as generated src (#3572 )	2017-04-20 08:58:39 +01:00
Santiago M. Mola	e80b92e407	Fix heuristic for Unix Assembly with .ms extension (#3550 )	2017-04-06 22:01:42 +10:00
Martin Nowak	fa6ae1116f	better heuristic distinction of .d files (#3145 ) * fix benchmark - require json for Hash.to_json * better heuristic distinction of .d files - properly recongnize dtrace probes - recongnize \ in Makefile paths - recongnize single line `file.ext : dep.ext` make targets - recognize D module, import, function, and unittest declarations - add more representative D samples D changed from 31.2% to 28.1% DTrace changed from 33.5% to 32.5% Makefile changed from 35.3% to 39.4% See https://gist.github.com/MartinNowak/fda24fdef64f2dbb05c5a5ceabf22bd3 for the scraper used to get a test corpus.	2017-03-30 18:25:53 +01:00
Yuki Izumi	b7e27a9f58	.pod disambiguation heuristic fix (#3541 ) Look for any line starting with "=\w+", not full lines, otherwise we miss e.g. "=head1 HEADING".	2017-03-27 14:10:17 +11:00
Javier Honduvilla Coto	69ba4c5586	Update the `Instrumenter` doc ... (#3530 ) ... with an instance of the given`Instrumenter` instead of the class itself.	2017-03-23 06:11:45 +01:00
Rafer Hazen	c39d7fd6e8	Add data-engineering staff to maintainers list (#3533 )	2017-03-22 07:06:58 -06:00
Yuki Izumi	44ed47cea1	Release v5.0.8 (#3535 )	2017-03-22 16:41:36 +11:00
Yuki Izumi	de51cb08d2	Add .mdwn for Markdown (#3534 )	2017-03-22 16:28:59 +11:00
Ronald Wampler	3dd2d08190	Add `.mdown` as an extension for Markdown (#3525 ) * Add `.mdown` as an extension for Markdown * Add `.mdown` sample	2017-03-22 16:14:54 +11:00