merge in fix for get_current_block_age

Dan Notesteinrequested to merge
merge-master into master

Merge request reports