Merge "Merge branch '1.3-rel' (6bf7601f)"
authorGerrit Code Review <gerrit@iotivity.org>
Mon, 3 Jul 2017 22:32:20 +0000 (22:32 +0000)
committerGerrit Code Review <gerrit@iotivity.org>
Mon, 3 Jul 2017 22:32:20 +0000 (22:32 +0000)

Trivial merge