Merge pull request #7038 from StevenPuttemans:fix_module_including
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 4 Aug 2016 13:23:41 +0000 (13:23 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Thu, 4 Aug 2016 13:23:41 +0000 (13:23 +0000)

Trivial merge