Summary of changes: 5526916... Fix various bugs (*) 6c87763... Add patch to fix crash bug (*) 729609f... Merge branch 'master' into el6 (*) This commit already existed in another branch; no separate mail sent