This should get merged
Merge pull request #3 from EternalGoldenBraid/pr_OPS-1500_20141204

This should get merged