From a2cc01f8fb81cb6706928d8dda54175ee3e5735d 2017-09-13 10:34:40
From: Marcin Kuzminski <marcin@rhodecode.com>
Date: 2017-09-13 10:34:40
Subject: [PATCH] merge stable into default

---