Sync'd branch releases/aurora with upstream @ Mon Sep 22 16:50:35 PDT 2014