Merge branch 'patrick_symbols'