Merge branch 'feature/independent-php' into 'master'

Marius Cramer

2015-05-19 8603b4abde47d11ce9900166cd38ed8f46dc11d2

1
ALTER TABLE `shell_user` CHANGE `ssh_rsa` `ssh_rsa` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL;