diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..856fa5a0
--- /dev/null
+++ b/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,16 @@
+## What type of PR?
+
+(Feature, enhancement, bug-fix, documentation)
+
+## What does this PR do?
+
+### Related issue(s)
+- Mention an issue like: #001
+- Auto close an issue like: closes #001
+
+## Prerequistes
+Before we can consider review and merge, please make sure the following list is done and checked.
+If an entry in not applicable, you can check it or remove it from the list.
+
+- [ ] In case of feature or enhancement: documentation updated accordingly
+- [ ] Unless it's docs or a minor change: place entry in the [changelog](CHANGELOG.md), under the latest un-released version.
diff --git a/core/admin/requirements-prod.txt b/core/admin/requirements-prod.txt
index a538c023..3679b63f 100644
--- a/core/admin/requirements-prod.txt
+++ b/core/admin/requirements-prod.txt
@@ -34,7 +34,7 @@ pyOpenSSL==18.0.0
 python-dateutil==2.7.5
 python-editor==1.0.3
 pytz==2018.7
-PyYAML==3.13
+PyYAML==4.2b4
 redis==3.0.1
 six==1.11.0
 SQLAlchemy==1.2.13
diff --git a/docs/faq.rst b/docs/faq.rst
index cf1895ea..2669d9d1 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -204,6 +204,41 @@ correct syntax. The following file names will be taken as override configuration
 
 *Issue reference:* `206`_.
 
+I want to integrate Nextcloud with Mailu
+````````````````````````````````````````
+
+First of all you have to install dependencies required to authenticate users via imap in Nextcloud
+
+.. code-block:: bash
+
+  apt-get update \
+   && apt-get install -y libc-client-dev libkrb5-dev \
+   && rm -rf /var/lib/apt/lists/* \
+   && docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
+   && docker-php-ext-install imap
+
+Next, you have to enable External user support from Nextcloud Apps interface
+
+In the end you need to configure additional user backends in Nextcloud’s configuration config/config.php using the following syntax:
+
+.. code-block:: bash
+
+  <?php
+
+  'user_backends' => array(
+      array(
+          'class' => 'OC_User_IMAP',
+          'arguments' => array(
+              '{imap.example.com:993/imap/ssl}', 'example.com'
+          ),
+      ),
+  ),
+
+If a domain name (e.g. example.com) is specified, then this makes sure that only users from this domain will be allowed to login.
+After successfull login the domain part will be striped and the rest used as username in NextCloud. e.g. 'username@example.com' will be 'username' in NextCloud.
+
+*Issue reference:* `575`_.
+
 .. _`Postfix`: http://www.postfix.org/postconf.5.html
 .. _`Dovecot`: https://wiki.dovecot.org/ConfigFile
 .. _`NGINX`:   https://nginx.org/en/docs/
@@ -218,6 +253,7 @@ correct syntax. The following file names will be taken as override configuration
 .. _`747`: https://github.com/Mailu/Mailu/issues/747
 .. _`520`: https://github.com/Mailu/Mailu/issues/520
 .. _`591`: https://github.com/Mailu/Mailu/issues/591
+.. _`575`: https://github.com/Mailu/Mailu/issues/575
 
 Technical issues
 ----------------
@@ -304,7 +340,7 @@ See also :ref:`external_certs`.
 *Issue reference:* `426`_, `615`_.
 
 How do I activate DKIM and DMARC?
-```````````````````````
+`````````````````````````````````
 Go into the Domain Panel and choose the Domain you want to enable DKIM for.
 Click the first icon on the left side (domain details).
 Now click on the top right on the *"Regenerate Keys"* Button.
@@ -367,7 +403,6 @@ We **strongly** advice against downgrading the TLS version and ciphers!
 
 *Issue reference:* `363`_, `698`_.
 
-
 .. _`troubleshooting tag`: https://github.com/Mailu/Mailu/issues?utf8=%E2%9C%93&q=label%3Afaq%2Ftroubleshooting
 .. _`85`: https://github.com/Mailu/Mailu/issues/85
 .. _`102`: https://github.com/Mailu/Mailu/issues/102