Merge branch 'master' into 'master'

Marius Cramer

2015-01-05 dee987b263b021b990ea4c62cb15be47c6d61fb5

interface/web/dns/dns_dkim_get.php does not exist in tree 296ea3470771c717afb6557ebc6b37df442dfd06