Merge remote-tracking branch 'remotes/vivier-misc/tags/pull-muldiv64-20150925' into...