Commit 42627933327bb8f91ae847bc8c72ab15ec1e2592

Carlos Martín Nieto 2017-11-04T18:03:26

Merge remote-tracking branch 'upstream/master' into pks/conditional-includes