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