Update for Habari 0.10 master as of 11/11/2013 (eebf01bcec2e4407df854d4956fda272bbfa3b1d)