Change to mktime as I think this should make it compatible with local timezone's set in php, we could always change later but this should maintain backwards compatibility initially
Merge remote-tracking branch 'origin/Develop'