[Merge] unity:include-fixes into unity:master

[Marco Trevisan (Treviño)]

Marco Trevisan (Treviño) has proposed merging unity:include-fixes into unity:master.

Requested reviews:
  Unity Team (unity-team)

For more details, see:
https://code.launchpad.net/~unity-team/unity/+git/unity/+merge/358294
-- 
Your team Unity Team is requested to review the proposed merge of unity:include-fixes into unity:master.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1798 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20181105/fdea26c6/attachment.diff>