qcubed/framework — pull request #466 by spekary (2014-09-02 05:19:24+00:00)
Title: Alpha merge

Merging current master into alpha-3