Maya integration: fixed merge conflict#53

Ibm510000 wants to merge 1 commit intoGriddle-Assets:mainGriddle-Assets/griddle-asset-db:mainfrom

Ibm510000:maya_merge_branchIbm510000/griddle-asset-db:maya_merge_branchCopy head branch name to clipboard