Merge in changes from tmehlinger