Merge pull request #632 from mndrix/deprecate-getblocknumber