Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 16 20:43:41 PDT 2014