Merge "Fix for object loader not handling flags correctly." into devel/master