Merge on branch master. Files changed : src/constant.cpp