Merge release into develop [skip ci]

Author: Nubisproject (Mozilla)

CHANGELOG.md

@@ -9,8 +9,14 @@
 
 **Closed issues:**
 
+- Tag v2.1.0-rc1 release [\#225](https://github.com/nubisproject/nubis-docs/issues/225)
 - Tag v2.1.0-rc1 release [\#223](https://github.com/nubisproject/nubis-docs/issues/223)
 
+**Merged pull requests:**
+
+- Merge v2.1.0-rc1 release into develop. \[skip ci\] [\#227](https://github.com/nubisproject/nubis-docs/pull/227) ([tinnightcap](https://github.com/tinnightcap))
+- Update CHANGELOG for v2.1.0-rc1 release \[skip ci\] [\#226](https://github.com/nubisproject/nubis-docs/pull/226) ([tinnightcap](https://github.com/tinnightcap))
+
 ## [v2.0.3](https://github.com/nubisproject/nubis-docs/tree/v2.0.3) (2017-11-02)
 [Full Changelog](https://github.com/nubisproject/nubis-docs/compare/v2.0.2...v2.0.3)