Merge pull request 150 from dev/242-noinlining into develop

This commit is contained in:
Andy Schwartzmeyer
2015-09-18 19:06:17 +00:00