Solves the thread contention problem reported on Issue #254#255

lviggiano merged 1 commit intomatteobaccan:mastermatteobaccan/owner:masterfrom

raulcaj:masterraulcaj/owner:masterCopy head branch name to clipboard