Bug 951369
Bug 951436 - handling Windows platform on paging
Merge pull request #355 from fabianofranz/master

Bug fixes