qcubed/framework — pull request #335 by vakopian (2013-10-22 04:08:07+00:00)
Title: merge with changes with upstream:0fab3abfeff3cf7cec2d8af6830701262a622d9a

upstream issue #305