Merge commit 'xf86-input-synaptics-1.4.0'