selecting best from ours
Merge branch 'master' of github.com:mfaruqui/sp2013.11-731