Merge pull request #772 from leider/master

moment-timezone is fixed now