ref: d812bca336c8d67a5b1a9744b36c0ecbb5baa8b3
parent: 029801c149836ea76776a9bbebe7bed532febdba
parent: 34dd7330431c99292c332c724e0e493b08e40bd6
author: gkostka <kostka.grzegorz@gmail.com>
date: Mon Apr 7 19:36:00 EDT 2014
Merge with test_suite branch.