Changsung Kim 2014-04-09 42911db Merge remote-tracking branch 'insanehong/issue-1148' into feature/organization-on-master UNIX