Merge pull request #304 from EricWittmann/master

uprev of overlord commons to latest dev snapshot