Committing
Merge branch 'master' into pull_ssoegyono_20130621094752880