Merge branch 'master' into development
Changes needed for drupalexention module
Remove my patch since the work was pulled into the library
Merge branch 'development'