Merge from dubrovka
+
core PR # 126 : Fix a notice for UrlEnhancer that returned empty content