Revision 0.1.5
Merge branch 'master' into gh-pages

* master:
  Revision 0.1.5