Automatic message for commit of Sat Oct  4 18:36:14 UTC 2014
Merge branch 'master' of https://github.com/datalayer/emulator