Merge pull request #1053 from jwerner-chromium/JW_func_align

Add new alignment parameter to func assembler macro