Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 07:08:41 PDT 2014