CG-CamSys/oneclick — pull request #151 by quinn (2014-07-29 20:29:09+00:00)
Title: Upstream develop

Changes from upstream