pentaho/mondrian — pull request #195 by mkambol (2013-11-20 13:56:52+00:00)
Title: [MONDRIAN-1726][MONDRIAN-1785]  Cherry pick of commits from master for SP.

SP-669
SP-596