Adding seconds into timestamp on extended log view
Fixing merged code for 1.6 elixr use
Merge branch '1.5'