[sr-dev] git:master:261c8a81: Merge pull request #693 from sjthomason/fix-cfg-block-alignment