Bug fix 1769858 and 1822162
Bug fix 1769858 continued
*** empty log message ***
Updated copyright notice
Bug fix 1769858
Improved pscustom formatting
Added OSX specific tasks