nromanen/ch018-2team- — pull request #21 by etenzor (2014-01-10 22:22:56+00:00)
Title: Merge pull request #20 from nromanen/master

merge master->edd(10.1.14_2)