xserver: Branch 'master'

[Adam Jackson]

On Fri, 2016-05-27 at 18:49 +0900, Michel Dänzer wrote:

> As mentioned on IRC, this commit broke the +iglx command line flag for
> me: In addition to +iglx no longer enabling indirect GLX,

This is my mistake. ddxProcessArgument is eating the flag by returning
1 instead of 0 so dix never gets a chance to see it. Patch to follow in
a moment.

> passing it on
> the command line prevents Option "IndirectGLX" from enabling indirect
> GLX as well.

This much is intentional, command line options always override the
config file.

- ajax