Merge branch 'jtotz-bdwgc-integrate-2'
authorIvan Maidanski <ivmai@mail.ru>
Mon, 11 May 2015 16:16:08 +0000 (19:16 +0300)
committerIvan Maidanski <ivmai@mail.ru>
Mon, 11 May 2015 16:16:08 +0000 (19:16 +0300)

Trivial merge