Merging all recent changes from ifunsoftware\c3-web master