Fix conflict with other inventory modification plugins (like JSNONAPI) i... #13

Closed
caver115 wants to merge 2 commits from master into master

2 Commits