forgot im not using logging yet on server
back to paste we go
Merge remote-tracking branch 'upstream/master'