Merge "dali-swig in ubuntu crash fix" into devel/master