Sync'd branch integration/b2g-inbound with upstream @ Tue Sep  9 11:49:41 PDT 2014