Update common lib
Merge pull request #544 from Icenium/fatme/update-common-with-merge-sha

Update common lib with merge sha