scriptcs/scriptcs — pull request #881 by adamralph (2014-12-23 17:40:04+00:00)
Title: merge dev to master

#876