Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 15:28:49 PDT 2014