Pull changes from master into xlib-plugin