IDE-770

Greg,

As per your last comment I did rebase and pushed the new branch in.