AUTOCOMMIT(ztakhiro): Thu Oct  9 16:16:20 PDT 2014
Merge branch 'master' of https://github.com/zafartahirov/setup