Merge branch 'MiscFixes' of github.com:dlobo/civicrm-core into dlobo-MiscFixes