Restores changes from @smspence
Restores changes from @smspence

smspence/liveplant-server,DevonYarbrough/liveplant-server,bendavis78/liveplant-server,DevonYarbrough/liveplant-server,bendavis78/liveplant-server,liveplant/liveplant-server,smspence/liveplant-server,liveplant/liveplant-server