merge

Merge branch 'master' into good, last merged Dec 23, 2013