Merged tingletech-travisci branch.
Authored by: Martin Haye 2014-04-17
Parents: [9a3348][b35bb4]
Child: [5ceace]