Merge branch 'phpmyadmin-integration'