Include fixed
Merge branch 'update' into travis.linux