FB 5858
Merge pull request #106 from mariapavlova/2014.11

FB 5858