Fix duplicate index error when using custom attributes.
Merge pull request #374 from cdearborn/pull-req-master-fc688ffdeeaf809a3e66a8a50f4197dfcd43c390

Merged by devtool for cloudedge