medranocalvo Merge branch 'arnebab.github.com/master' into externals/exwm