merge master

Author: LieutenantRoger

.circleci/config.yml

@@ -150,7 +150,7 @@ workflows:
           context : org-global
           filters: &filters-dev
             branches:
-              only: ['develop', 'issue_1323']
+              only: ['develop']
 
       # Production builds are exectuted only on tagged commits to the
       # master branch.