Fix non trading day
Merge branch 'hotfix/2014-10-02-fix4'
Merge tag '2014-10-02-fix4' into develop

Fix