Merge branch 'Development' into fixup_probing

Latest upstream commits
This commit is contained in:
Scott Lahteine
2015-04-03 15:32:15 -07:00