merge from schmunk42/origin/master