Ugly auto-indent for templates

With latest snapshot (Sep 22, b6d34c086c, do not remember about previous versions/snapshots) the auto-indention of template classes is very ugly! For example, try create simple template class and automatic indention suggests you this "style":

template<class Boo> class Foo
{
                      |
                    };

where | is the cursor position.
However, if you split first line like in the example below, auto-indention works as expected:

template<class Boo>
class Foo
{
  | 
};

except second line ("class Foo") that should be indented IMHO.

I've attached a screenshot with my Options->Text Editor->Behaviour tab.