Happy New Year 2014!
Merge remote-tracking branch: upstream/master