Merge remote-tracking branch 'quintela/thread-20121220.next' into staging