20140422.0134 #merge# H04S3128:master

.pull request for updates