Wouterrr/A1 — pull request #22 by rjmackay (2013-04-23 01:33:20+00:00)
Title: Merge master updates in 3.3/develop

Quick update of 3.3/develop to merge changes from master branch.