scriptcs/scriptcs — pull request #857 by adamralph (2014-11-23 00:02:51+00:00)
Title: merge dev to master

#851