Merge pull request #356 from webdetails/5.1-sandbox

cherry-picked from master: