Update 201402211114

Applied the changes of branch-201311252111 to master. Updates are on
that branch