Updates

hg pull && hg update up till October 12th 2014.