Merge from windll branch (nothing important)
authorpavel <pavel@aaa>
Sat, 18 Oct 2014 04:36:34 +0000 (07:36 +0300)
committerpavel <pavel@aaa>
Sat, 18 Oct 2014 04:36:34 +0000 (07:36 +0300)

Trivial merge