Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  9 21:28:39 PDT 2014