Urgent
Merge pull request #1 from EternalGoldenBraid/pr_OPS-1500_20141127

Urgent