Fixed compilation failure for x = inner_prod(x,y) * z;

Also added test to ensure this does not break again uncaught.
Merge branch 'master' of github.com:viennacl/viennacl-dev