Merge tag 'upstream/8.1.0+r23'

Upstream version 8.1.0+r23

# gpg: Signature made Wed 30 May 2018 02:30:18 PM +0530
# gpg:                using RSA key FFB857889E3418C9E004030D66573069F2E304B8
# gpg: Good signature from "Saif Abdul Cassim <saif.15@cse.mrt.ac.lk>" [unknown]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: FFB8 5788 9E34 18C9 E004  030D 6657 3069 F2E3 04B8