Merge "Fix for object loader not handling flags correctly." into devel/master
authorPaul Wisbey <p.wisbey@samsung.com>
Thu, 2 Jun 2016 17:15:21 +0000 (10:15 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 2 Jun 2016 17:15:21 +0000 (10:15 -0700)

Trivial merge