Merge branch 'Neon/stable' into Neon/unstable

Authored by jriddell on May 10 2017, 2:12 PM.

Description

Merge branch 'Neon/stable' into Neon/unstable

Merged Changes

CommitAuthorDetailsCommitted
aa22b7690e13 jriddell
Merge branch 'Neon/release' into Neon/stable 
May 10 2017
a95c50b499aa jriddell
Merge branch 'Neon/release-lts' into Neon/release 
May 10 2017
a66dc1d8b4bf jriddell
better workaround 
May 10 2017