Azure/azure-content — pull request #2136 by MonicaRush (2014-10-13 21:58:46+00:00)
Title: My merge

Resolved merge conflict.