Merge remote-tracking branch 'origin' into release
Removed session based cache, as it do not play nice with drupal
Merge branch 'release' into development