core: Use lockfree os:timestamp() instead of erlang:now()
Merge branch 'master' into develop