Merge pull request #2 from saukko/master

Update to 1.6.18
[packaging] make x11 buildrequire optional

Signed-off-by: Islam Amer <islam.amer@jollamobile.com>
Merge pull request #3 from mer-packages/next

Make X11 optional