Update master to track resent changes in SVN Extend