Merge remote-tracking branch 'ispc/master' into new-layout-3.1

Marius Cramer

2015-01-06 9724f8f13bdc6bfb2f9649c54ad37fb45bea9870

interface/web/js/dns_dkim.js does not exist in tree ab78dee00db03f7afea5729a99bfd72822f4dbf2