merging from wycats mainline
merging master