Sync'd branch releases/aurora with upstream @ Tue Sep 23 14:24:35 PDT 2014