Lil' rest patch
Merge remote-tracking branch 'origin/master'