Famous/famous — pull request #514 by ftripier (2014-12-03 23:04:33+00:00)
Title: Next tick fix

Highly technical fix to #487