Pull Master 2013-09-05

pull request master