Commits in gko2016/gko2016:master