Fix offset naive/aware datetime issue
Merge branch 'master' of github.com:taeram/stratagem