Merge for Shannon Deploy 2013-10-23