Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fix for bug USERGRID-94, ICLA - Malaka Mahanama
Unit tests for USERGRID-94 fix, ICLA - Malaka Mahanama
Merge pull request #151 from malakaM/94

94: Fix and new associated test cases for USERGRID-94. ICLA - Malaka Mahanama