Sync'd branch releases/aurora with upstream @ Mon Sep 22 09:11:34 PDT 2014