added post draw callback option
Merge branch 'refs/heads/upstream-master'