apache/stratos — pull request #125 by swgkg (2014-11-28 11:38:45+00:00)
Title: Merge the master with the changes of PR #121

Please review and merge