Fixed merge conflict.
Merge branch 'master' into sitimechart