diff --git a/.gitattributes b/.gitattributes
index ad05c5edc6a4e97e556cae78ec953fc8fdcc6c66..2910f7cab4e97ef1d04a9d96a2e4e59edf92d29a 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -2693,7 +2693,7 @@ LCS/PyCommon/CMakeLists.txt -text
 LCS/PyCommon/__init__.py -text
 LCS/PyCommon/datetimeutils.py -text
 LCS/PyCommon/factory.py -text
-LCS/PyCommon/flask.py -text
+LCS/PyCommon/flask_utils.py -text
 LCS/PyCommon/postgres.py -text
 LCS/PyCommon/subprocess.py -text
 LCS/PyCommon/test/python-coverage.sh eol=lf
diff --git a/LCS/PyCommon/CMakeLists.txt b/LCS/PyCommon/CMakeLists.txt
index 36185af0ffab0bdb42a1266531b983f84f5068e7..9a2343ae01b52c48b894fa33e8ec397959d9a7f4 100644
--- a/LCS/PyCommon/CMakeLists.txt
+++ b/LCS/PyCommon/CMakeLists.txt
@@ -13,7 +13,7 @@ set(_py_files
   util.py
   postgres.py
   datetimeutils.py
-  flask.py
+  flask_utils.py
   subprocess.py)
 
 python_install(${_py_files} DESTINATION lofar/common)
diff --git a/LCS/PyCommon/flask.py b/LCS/PyCommon/flask_utils.py
similarity index 91%
rename from LCS/PyCommon/flask.py
rename to LCS/PyCommon/flask_utils.py
index c661816a7f976bd1632e4071506d85df0b32d1be..289e56fa68d63b01d888080e016202118ca6086d 100644
--- a/LCS/PyCommon/flask.py
+++ b/LCS/PyCommon/flask_utils.py
@@ -19,17 +19,18 @@
 
 # $Id$
 
-import flask
+from flask import after_this_request, request
 from cStringIO import StringIO as IO
 import gzip
 import functools
+from datetime import datetime
 
 def gzipped(f):
     @functools.wraps(f)
     def view_func(*args, **kwargs):
-        @flask.after_this_request
+        @after_this_request
         def zipper(response):
-            accept_encoding = flask.request.headers.get('Accept-Encoding', '')
+            accept_encoding = request.headers.get('Accept-Encoding', '')
 
             if 'gzip' not in accept_encoding.lower():
                 return response
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/webservice.py b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/webservice.py
index 63a3671871f67f0d55b8a4001f66c3392ff08c7d..3a99ae202a0f5800c40a5cec32a33c9673be4aba 100755
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/webservice.py
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/webservice.py
@@ -40,7 +40,7 @@ from flask import abort
 from flask import url_for
 from flask.json import jsonify
 from flask.json import JSONEncoder
-from lofar.common.flask import gzipped
+from lofar.common.flask_utils import gzipped
 from lofar.sas.resourceassignment.resourceassignmenteditor.fakedata import *
 from lofar.sas.resourceassignment.resourceassignmenteditor.changeshandler import ChangesHandler, CHANGE_DELETE_TYPE
 from lofar.sas.datamanagement.common.config import DEFAULT_DM_NOTIFICATION_BUSNAME, DEFAULT_DM_NOTIFICATION_SUBJECTS