Merge branch 'master' into todb-r7-master
Get pics automatically.
Merge branch 'todb-r7-master'