fixed a bug where i tried to do something that php already does by default (aka, using mktime where the month > 12)
Merge remote-tracking branch 'origin/master'