Fixes for issues #2867099 and #2510440
New version after fix by dbarbar
Added views submodulde and fixed PHP error
Final release post port