Merge branch 'ticket91'
authoradam <adamansky@gmail.com>
Mon, 19 Aug 2013 18:42:12 +0000 (01:42 +0700)
committeradam <adamansky@gmail.com>
Mon, 19 Aug 2013 18:42:12 +0000 (01:42 +0700)

Trivial merge