Merge "Moved font client plugin to new folder" into devel/master