diff --git a/History.markdown b/History.markdown
index 84a1b586..f2575649 100644
--- a/History.markdown
+++ b/History.markdown
@@ -5,10 +5,13 @@
   * Enable site excerpts (#5150)
   * Initial 404 page (#5143)
   * Remove the "this feature is unreleased" warning from the theme docs (#5158)
+  * Future True on GitHub Pages note (#5173)
+  * Minor updates and corrections (#5177)
 
 ### Bug Fixes
 
   * Include theme directories in default gemspec (#5152)
+  * Fix for symlinked themes (#5156)
 
 ## 3.2.0 / 2016-07-26
 
diff --git a/lib/jekyll/theme.rb b/lib/jekyll/theme.rb
index 4cd2d163..0dd73f78 100644
--- a/lib/jekyll/theme.rb
+++ b/lib/jekyll/theme.rb
@@ -10,7 +10,11 @@ module Jekyll
     end
 
     def root
-      @root ||= gemspec.full_gem_path
+      # Must use File.realpath to resolve symlinks created by rbenv
+      # Otherwise, Jekyll.sanitized path with prepend the unresolved root
+      @root ||= File.realpath(gemspec.full_gem_path)
+    rescue Errno::ENOENT, Errno::EACCES, Errno::ELOOP
+      nil
     end
 
     def includes_path
@@ -34,11 +38,8 @@ module Jekyll
     private
 
     def path_for(folder)
-      resolved_dir = realpath_for(folder)
-      return unless resolved_dir
-
-      path = Jekyll.sanitized_path(root, resolved_dir)
-      path if File.directory?(path)
+      path = realpath_for(folder)
+      path if path && File.directory?(path)
     end
 
     def realpath_for(folder)
diff --git a/site/_docs/upgrading/2-to-3.md b/site/_docs/upgrading/2-to-3.md
index f9390a21..3d15ec55 100644
--- a/site/_docs/upgrading/2-to-3.md
+++ b/site/_docs/upgrading/2-to-3.md
@@ -65,6 +65,14 @@ In Jekyll 3, this has been corrected. **Now, `--future` is disabled by default.*
 This means you will need to include `--future` if you want your future-dated posts to
 generate when running `jekyll build` or `jekyll serve`.
 
+<div class="note info">
+  <h5>Future Posts on GitHub Pages</h5>
+  <p>
+    An exception to the above rule are GitHub Pages sites, where the `--future` flag remains _enabled_
+    by default to maintain historical consistency for those sites. 
+  </p>
+</div>
+
 ### Layout metadata
 
 Introducing: `layout`. In Jekyll 2 and below, any metadata in the layout was merged onto
diff --git a/site/_docs/windows.md b/site/_docs/windows.md
index 72f0029e..d4189aed 100644
--- a/site/_docs/windows.md
+++ b/site/_docs/windows.md
@@ -75,13 +75,13 @@ This gem is also needed in the github-pages and to get it running on Windows x64
 **Note:** In the current [pre release][nokogiriFails] it works out of the box with Windows x64 but this version is not referenced in the github-pages.
 
 
-`cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libxml2`{:.language-ruby}
+`choco install libxml2 -Source "https://www.nuget.org/api/v2/"`{:.language-ruby}
 
-`cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libxslt`{:.language-ruby}
+`choco install libxslt -Source "https://www.nuget.org/api/v2/"`{:.language-ruby}
 
-`cinst -Source "https://go.microsoft.com/fwlink/?LinkID=230477" libiconv`{:.language-ruby}
+`choco install libiconv -Source "https://www.nuget.org/api/v2/"`{:.language-ruby}
 
-```language-ruby
+{% highlight ruby %}
  gem install nokogiri --^
    --with-xml2-include=C:\Chocolatey\lib\libxml2.2.7.8.7\build\native\include^
    --with-xml2-lib=C:\Chocolatey\lib\libxml2.redist.2.7.8.7\build\native\bin\v110\x64\Release\dynamic\cdecl^
@@ -89,7 +89,7 @@ This gem is also needed in the github-pages and to get it running on Windows x64
    --with-iconv-lib=C:\Chocolatey\lib\libiconv.redist.1.14.0.11\build\native\bin\v110\x64\Release\dynamic\cdecl^
    --with-xslt-include=C:\Chocolatey\lib\libxslt.1.1.28.0\build\native\include^
    --with-xslt-lib=C:\Chocolatey\lib\libxslt.redist.1.1.28.0\build\native\bin\v110\x64\Release\dynamic
-```
+{% endhighlight %}
 
 #### Install github-pages
 
@@ -98,10 +98,10 @@ This gem is also needed in the github-pages and to get it running on Windows x64
  * Copy & past the two lines into the file:
 
 
-```language-ruby
+{% highlight ruby %}
 source 'http://rubygems.org'
 gem 'github-pages'
-```
+{% endhighlight %}
 
  * **Note:** We use an unsecure connection because SSL throws exceptions in the version of Ruby
  * Open a command prompt, target your local blog repository root, and install github-pages: `bundle install`