From 03b9e7f4136d1c8bc1e1cfe06c48d2dbce8895f6 Mon Sep 17 00:00:00 2001
From: Pavel Krajcevski <pavel@cs.unc.edu>
Date: Thu, 10 Apr 2014 13:50:58 -0400
Subject: [PATCH] Merge branch 'ModularizeBPTC', remote-tracking branch
 'origin'