don't import pylab on OSX
Merge branch 'fix/osx_compat'
merge with old trunk - attachment upload - incomplete