20140422.0134 #merge# H04S3128:master

.merge updates from H04S3128:master