Deal with expired session issue
# [fix] session never expires after applying #2218
Merge pull request #2221 from phproberto/session-expire

# [fix] session never expires after applying #2218
Code style fixes