roll v1.2.5
Merge pull request #192 from neocotic/wip-1.2.5

1.2.5 WIP (Final)