tree b67bd8bcf6396d1aa6edc6cb9c37eb2db9ec8d1c
parent fdd918d1eb743543acec89b4ec8ad0b468142cdc
author Bob Brodt <bbrodt@redhat.com> 1417029553 -0700
committer Bob Brodt <bbrodt@redhat.com> 1417029553 -0700

Merge changes from develop branch