1.9
653ff9fb4ccf · Merge with stable · Dec 01, 2010