Pull Master 2013-09-05

Pull request Master