Copied git log aliases from jbirch@atlassian.com.
Merge branch 'master' into atlassian