Merge branch 'topic/constructor_rewrite'
Peter Rabbitson [Mon, 16 Apr 2012 01:15:30 +0000 (03:15 +0200)]

Trivial merge