Only emulate if needed

Signed-off-by: Rik Cabanier <cabanier@adobe.com>
Merge branch 'refs/heads/master' into gh-pages