AAROC/DevOps — pull request #148 by brucellino (2014-12-22 13:42:47+00:00)
Title: Forward porting updates to dev branch

After adding some functionality, it's time to go back into dev.