Added misc
Merge branch 'master' into gino
MERGED WITHOUT CONFLICT