upstream/0.6.0.20161123
c8f17dff · Merge branch 'trigger-update' ·