Merge branch 'ticket96'
authoradam <adamansky@gmail.com>
Tue, 3 Sep 2013 12:21:20 +0000 (19:21 +0700)
committeradam <adamansky@gmail.com>
Tue, 3 Sep 2013 12:21:20 +0000 (19:21 +0700)

Trivial merge