Built apc-1114 from commit 21c1a49 on branch master